Merge master into live-based

.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"
+        }
+      ]      
+}

.gitignore

@@ -1,4 +1,3 @@
-log/
 obj/
 azurecli/
 _site/

.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"
+  }
 }

.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
         }
     ]
 }