From a5016bdfd22e8cf88e151e55e29b86a5af697f91 Mon Sep 17 00:00:00 2001 From: LizRoss Date: Wed, 7 Sep 2016 10:58:47 -0700 Subject: [PATCH 1/6] Trying to force Live to refresh to re-publish --- windows/whats-new/contribute-to-a-topic.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/whats-new/contribute-to-a-topic.md b/windows/whats-new/contribute-to-a-topic.md index 3fb9fa0055..bdeebd7dea 100644 --- a/windows/whats-new/contribute-to-a-topic.md +++ b/windows/whats-new/contribute-to-a-topic.md @@ -1,6 +1,6 @@ --- title: Edit an existing topic using the Contribute link -description: Instructions about how to edit an existing topic by using the Contribute link. +description: Instructions about how to edit an existing topic by using the Contribute link on TechNet. keywords: contribute, edit a topic ms.prod: w10 ms.mktglfcycl: explore From 91c8087d56ec5d781bea8ec9a0ffe92e1114fd3d Mon Sep 17 00:00:00 2001 From: LizRoss Date: Fri, 14 Oct 2016 10:00:29 -0700 Subject: [PATCH 2/6] Restarting merge --- .../keep-secure/change-history-for-keep-windows-10-secure.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/keep-secure/change-history-for-keep-windows-10-secure.md b/windows/keep-secure/change-history-for-keep-windows-10-secure.md index b3dbbf5bb9..9fe6c9986e 100644 --- a/windows/keep-secure/change-history-for-keep-windows-10-secure.md +++ b/windows/keep-secure/change-history-for-keep-windows-10-secure.md @@ -16,7 +16,7 @@ This topic lists new and updated topics in the [Keep Windows 10 secure](index.md | New or changed topic | Description | | --- | --- | -|[Limitations while using Windows Information Protection (WIP)](limitations-with-wip.md) |Added content about using ActiveX controls. | +|[Limitations while using Windows Information Protection (WIP)](limitations-with-wip.md) |Added content about using ActiveX controls.| |[Unenlightened and enlightened app behavior while using Windows Information Protection (WIP)](app-behavior-with-wip.md) |New | |[VPN technical guide](vpn-guide.md) | Multiple new topics, replacing previous **VPN profile options** topic | From 8cd01c1f3327bd04119e82395f554c40805fc64e Mon Sep 17 00:00:00 2001 From: LizRoss Date: Fri, 21 Oct 2016 13:43:18 -0700 Subject: [PATCH 3/6] Removed text --- .../keep-secure/change-history-for-keep-windows-10-secure.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/keep-secure/change-history-for-keep-windows-10-secure.md b/windows/keep-secure/change-history-for-keep-windows-10-secure.md index dada97fc72..bba6f8cedc 100644 --- a/windows/keep-secure/change-history-for-keep-windows-10-secure.md +++ b/windows/keep-secure/change-history-for-keep-windows-10-secure.md @@ -16,7 +16,7 @@ This topic lists new and updated topics in the [Keep Windows 10 secure](index.md | New or changed topic | Description | | --- | --- | -|[Create and deploy a Windows Information Protection (WIP) policy using System Center Configuration Manager](create-wip-policy-using-sccm.md) and [Create a Windows Information Protection (WIP) policy using Microsoft Intune](create-wip-policy-using-intune.md) |Updated the text about the icon overlay option. This icon now only appears on corporate files in the Save As and File Explore views. | +|[Create and deploy a Windows Information Protection (WIP) policy using System Center Configuration Manager](create-wip-policy-using-sccm.md) and [Create a Windows Information Protection (WIP) policy using Microsoft Intune](create-wip-policy-using-intune.md) |Updated the text about the icon overlay option. This icon now only appears on corporate files in the Save As and File Explore views | |[Limitations while using Windows Information Protection (WIP)](limitations-with-wip.md) |Added content about using ActiveX controls.| |[Unenlightened and enlightened app behavior while using Windows Information Protection (WIP)](app-behavior-with-wip.md) |New | |[VPN technical guide](vpn-guide.md) | Multiple new topics, replacing previous **VPN profile options** topic | From 928f61bde053594d5f5bd33ec42c418ab023cf19 Mon Sep 17 00:00:00 2001 From: LizRoss Date: Wed, 9 Nov 2016 10:20:51 -0800 Subject: [PATCH 4/6] Added additional Edge link --- browsers/edge/Index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/browsers/edge/Index.md b/browsers/edge/Index.md index e261955400..d2f29d473e 100644 --- a/browsers/edge/Index.md +++ b/browsers/edge/Index.md @@ -58,6 +58,7 @@ You'll need to keep running them using IE11. If you don't have IE11 installed an ## Related topics +- [Total Economic Impact of Microsoft Edge: Infographic](https://www.microsoft.com/en-us/download/details.aspx?id=53892) - [Download Internet Explorer 11](https://go.microsoft.com/fwlink/p/?linkid=290956) - [Internet Explorer 11 (IE11) - Deployment Guide for IT Pros](https://go.microsoft.com/fwlink/p/?LinkId=760644) - [Internet Explorer 11 - FAQ for IT Pros](https://go.microsoft.com/fwlink/p/?LinkId=760645) From 7469b20c7eaad95bdc317cd8b7c7661b9a7fdf48 Mon Sep 17 00:00:00 2001 From: saldana Date: Wed, 16 Nov 2016 19:58:26 +0000 Subject: [PATCH 5/6] Initialize open publishing repository: https://github.com/Microsoft/win-cpub-itpro-docs of branch live --- .openpublishing.publish.config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index e06f28392e..204979c416 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -104,5 +104,6 @@ "git_repository_url_open_to_public_contributors": "https://github.com/Microsoft/windows-itpro-docs", "git_repository_branch_open_to_public_contributors": "master", "skip_source_output_uploading": false, - "dependent_repositories": [] + "dependent_repositories": [], + "need_generate_pdf_url_template": false } \ No newline at end of file From eb26c877cdc0aea906c957d7e8d26e7bd7ba39eb Mon Sep 17 00:00:00 2001 From: brianlic-msft Date: Thu, 17 Nov 2016 17:52:14 +0000 Subject: [PATCH 6/6] Initialize open publishing repository: https://github.com/Microsoft/win-cpub-itpro-docs of branch live --- .openpublishing.publish.config.json | 14 ++++++++++++ smb/TOC.md | 1 + smb/docfx.json | 35 +++++++++++++++++++++++++++++ smb/index.md | 1 + 4 files changed, 51 insertions(+) create mode 100644 smb/TOC.md create mode 100644 smb/docfx.json create mode 100644 smb/index.md diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index 204979c416..62ffa53977 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -93,6 +93,20 @@ "type_mapping": { "Conceptual": "Content" } + }, + { + "docset_name": "smb", + "build_source_folder": "smb", + "build_output_subfolder": "smb", + "locale": "en-us", + "version": 0, + "open_to_public_contributors": false, + "type_mapping": { + "Conceptual": "Content", + "ManagedReference": "Content", + "RestApi": "Content" + }, + "build_entry_point": "op" } ], "notification_subscribers": [ diff --git a/smb/TOC.md b/smb/TOC.md new file mode 100644 index 0000000000..06913f7aef --- /dev/null +++ b/smb/TOC.md @@ -0,0 +1 @@ +# [Index](index.md) \ No newline at end of file diff --git a/smb/docfx.json b/smb/docfx.json new file mode 100644 index 0000000000..033a3552a9 --- /dev/null +++ b/smb/docfx.json @@ -0,0 +1,35 @@ +{ + "build": { + "content": [ + { + "files": [ + "**/*.md" + ], + "exclude": [ + "**/obj/**", + "smb/**", + "**/includes/**" + ] + } + ], + "resource": [ + { + "files": [ + "**/*.png", + "**/*.jpg" + ], + "exclude": [ + "**/obj/**", + "smb/**", + "**/includes/**" + ] + } + ], + "overwrite": [], + "externalReference": [], + "globalMetadata": {}, + "fileMetadata": {}, + "template": [], + "dest": "smb" + } +} \ No newline at end of file diff --git a/smb/index.md b/smb/index.md new file mode 100644 index 0000000000..f934a00bb1 --- /dev/null +++ b/smb/index.md @@ -0,0 +1 @@ +# Welcome to smb! \ No newline at end of file