diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index 9a2514f..c0f6d3d 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -21,7 +21,7 @@ ], "docsets_to_publish": [ { - "base_path": "powershell", + "base_path": "powershell/dsc", "build_entry_point": "docs", "build_output_subfolder": "PowerShell-Docs-DSC", "build_source_folder": "dsc", diff --git a/dsc/breadcrumb/toc.yml b/dsc/breadcrumb/toc.yml index 6ce87de..78e8a96 100644 --- a/dsc/breadcrumb/toc.yml +++ b/dsc/breadcrumb/toc.yml @@ -10,8 +10,8 @@ tocHref: /powershell/dsc/ topicHref: /powershell/dsc/overview - name: PowerShell DSC - tocHref: /powershell/module/dsc-2.0 + tocHref: /powershell/dsc/module/dsc-2.0 topicHref: /powershell/dsc/overview - name: PowerShell DSC - tocHref: /powershell/module/dsc-3.0 + tocHref: /powershell/dsc/module/dsc-3.0 topicHref: /powershell/dsc/overview diff --git a/dsc/docfx.json b/dsc/docfx.json index 941bf1b..76f7c30 100644 --- a/dsc/docfx.json +++ b/dsc/docfx.json @@ -1,17 +1,19 @@ { "build": { "content": [ - { "dest": "dsc/breadcrumb", "files": [ "toc.yml" ], "src": "breadcrumb" }, + { "dest": "breadcrumb", "files": [ "toc.yml" ], "src": "breadcrumb" }, - { "dest": "dsc", "files": [ "**/*.md", "**/*.yml" ], "src": "docs-conceptual/dsc-2.0", "version": "dsc-2.0" }, + { "dest": "", "files": [ "**/*.md", "**/*.yml" ], "src": "docs-conceptual/dsc-2.0", "version": "dsc-2.0" }, { "dest": "module", "exclude": [ "toc.yml" ], "files": [ "**/*.yml" ], "src": "dsc-2.0", "version": "dsc-2.0" }, - { "dest": "module/dsc-2.0", "files": [ "**/About/*.md", "**/*.yml" ], "src": "dsc-2.0", "version": "dsc-2.0" }, + { "dest": "module", "files": [ "**/About/*.md" ], "src": "dsc-2.0", "version": "dsc-2.0" }, + { "dest": "module/dsc-2.0", "files": [ "toc.yml" ], "src": "dsc-2.0", "version": "dsc-2.0" }, - { "dest": "dsc", "files": [ "**/*.md", "**/*.yml" ], "src": "docs-conceptual/dsc-3.0", "version": "dsc-3.0" }, + { "dest": "", "files": [ "**/*.md", "**/*.yml" ], "src": "docs-conceptual/dsc-3.0", "version": "dsc-3.0" }, { "dest": "module", "exclude": [ "toc.yml" ], "files": [ "**/*.yml" ], "src": "dsc-3.0", "version": "dsc-3.0" }, - { "dest": "module/dsc-3.0", "files": [ "**/About/*.md", "**/*.yml" ], "src": "dsc-3.0", "version": "dsc-3.0" }, + { "dest": "module", "files": [ "**/About/*.md" ], "src": "dsc-3.0", "version": "dsc-3.0" }, + { "dest": "module/dsc-3.0", "files": [ "toc.yml" ], "src": "dsc-3.0", "version": "dsc-3.0" }, - { "dest": "dsc", "files": [ "**/*.md", "**/*.yml" ], "src": "virtual-folder" }, + { "dest": "", "files": [ "**/*.md", "**/*.yml" ], "src": "virtual-folder" }, { "dest": "module", "files": [ "**/*.md", "**/*.yml" ], "src": "virtual-folder-module" } ], "exportRawModel": true, diff --git a/dsc/mapping/monikerMapping.json b/dsc/mapping/monikerMapping.json index 5523db5..9f26b90 100644 --- a/dsc/mapping/monikerMapping.json +++ b/dsc/mapping/monikerMapping.json @@ -2,13 +2,13 @@ "dsc-2.0": { "packageRoot": "dsc-2.0", "conceptualToc": "docs-conceptual/dsc-2.0/toc.yml", - "conceptualTocUrl": "/powershell/dsc/dsc-2.0/toc.json", - "referenceTocUrl": "/powershell/module/dsc-2.0/toc.json", + "conceptualTocUrl": "/powershell/dsc/toc.json", + "referenceTocUrl": "/powershell/dsc/module/dsc-2.0/toc.json", }, "dsc-3.0": { "packageRoot": "dsc-3.0", "conceptualToc": "docs-conceptual/dsc-3.0/toc.yml", - "conceptualTocUrl": "/powershell/dsc/dsc-3.0/toc.json", - "referenceTocUrl": "/powershell/module/dsc-3.0/toc.json", + "conceptualTocUrl": "/powershell/dsc/toc.json", + "referenceTocUrl": "/powershell/dsc/module/dsc-3.0/toc.json", } }