Merge remote-tracking branch 'refs/remotes/origin/master' into live

2025-05-21 17:57:22 +00:00 · 2017-01-25 15:49:00 -08:00 · 2017-01-25 15:49:00 -08:00 · 29e8753760
commit 29e8753760
parent eb50373cf4 edfbf89290
129 changed files with 1 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -10,8 +10,6 @@ Tools/NuGet/
 .openpublishing.build.mdproj
 .openpublishing.buildcore.ps1
 packages.config
-windows/keep-secure/index.md

 # User-specific files  
-.vs/
-*.png
+.vs/
--- a/browsers/internet-explorer/ie11-deploy-guide/images/docmode-decisions-lg.png
+++ b/browsers/internet-explorer/ie11-deploy-guide/images/docmode-decisions-lg.png
--- a/browsers/internet-explorer/ie11-deploy-guide/images/docmode-decisions-sm.png
+++ b/browsers/internet-explorer/ie11-deploy-guide/images/docmode-decisions-sm.png
--- a/education/windows/images/mcee-add-payment-method.png
+++ b/education/windows/images/mcee-add-payment-method.png
--- a/education/windows/images/mcee-invoice-bills.PNG
+++ b/education/windows/images/mcee-invoice-bills.PNG
--- a/education/windows/images/mcee-invoice-info.png
+++ b/education/windows/images/mcee-invoice-info.png
--- a/education/windows/images/mcee-view-bills.png
+++ b/education/windows/images/mcee-view-bills.png
--- a/education/windows/images/win-10-activated-enterprise-subscription-active.png
+++ b/education/windows/images/win-10-activated-enterprise-subscription-active.png
--- a/education/windows/images/win-10-activated-enterprise-subscription-not-active.png
+++ b/education/windows/images/win-10-activated-enterprise-subscription-not-active.png
--- a/education/windows/images/win-10-not-activated-enterprise-subscription-active.png
+++ b/education/windows/images/win-10-not-activated-enterprise-subscription-active.png
--- a/education/windows/images/win-10-not-activated-enterprise-subscription-not-active.png
+++ b/education/windows/images/win-10-not-activated-enterprise-subscription-not-active.png
--- a/education/windows/images/win-10-pro-edu-activated-subscription-active.png
+++ b/education/windows/images/win-10-pro-edu-activated-subscription-active.png
--- a/education/windows/images/win-10-pro-edu-not-activated-subscription-active.PNG
+++ b/education/windows/images/win-10-pro-edu-not-activated-subscription-active.PNG
--- a/education/windows/images/win10-connect-to-work-or-school.png
+++ b/education/windows/images/win10-connect-to-work-or-school.png
--- a/education/windows/images/win10-lets-get-2.png
+++ b/education/windows/images/win10-lets-get-2.png
--- a/education/windows/images/win10-set-up-work-or-school.png
+++ b/education/windows/images/win10-set-up-work-or-school.png
--- a/education/windows/images/windows-ad-connect.png
+++ b/education/windows/images/windows-ad-connect.png
--- a/education/windows/images/windows-choose-how.png
+++ b/education/windows/images/windows-choose-how.png
--- a/education/windows/images/windows-connect-to-work-or-school.png
+++ b/education/windows/images/windows-connect-to-work-or-school.png
--- a/education/windows/images/windows-lets-get-2.png
+++ b/education/windows/images/windows-lets-get-2.png
--- a/education/windows/images/windows-lets-get.png
+++ b/education/windows/images/windows-lets-get.png
--- a/education/windows/images/windows-set-up-work-or-school.png
+++ b/education/windows/images/windows-set-up-work-or-school.png
--- a/education/windows/images/windows-sign-in.png
+++ b/education/windows/images/windows-sign-in.png
--- a/education/windows/images/windows-who-owns.png
+++ b/education/windows/images/windows-who-owns.png
--- a/education/windows/images/windows.png
+++ b/education/windows/images/windows.png
--- a/education/windows/images/wsfb_win10_pro_education_enabled_for_org.png
+++ b/education/windows/images/wsfb_win10_pro_education_enabled_for_org.png
--- a/education/windows/images/wsfb_win10_pro_education_launch.png
+++ b/education/windows/images/wsfb_win10_pro_education_launch.png
--- a/education/windows/images/wsfb_win10_pro_education_order_confirmation.png
+++ b/education/windows/images/wsfb_win10_pro_education_order_confirmation.png
--- a/education/windows/images/wsfb_win10_pro_education_order_options.png
+++ b/education/windows/images/wsfb_win10_pro_education_order_options.png
--- a/education/windows/images/wsfb_win10_pro_education_refund_confirmation.png
+++ b/education/windows/images/wsfb_win10_pro_education_refund_confirmation.png
--- a/education/windows/images/wsfb_win10_pro_education_refund_order.png
+++ b/education/windows/images/wsfb_win10_pro_education_refund_order.png
--- a/education/windows/images/wsfb_win10_pro_to
+++ b/education/windows/images/wsfb_win10_pro_to
--- a/education/windows/images/wsfb_win10_pro_to
+++ b/education/windows/images/wsfb_win10_pro_to
--- a/education/windows/images/wsfb_win10_pro_to
+++ b/education/windows/images/wsfb_win10_pro_to
--- a/education/windows/images/wsfb_win10_pro_to
+++ b/education/windows/images/wsfb_win10_pro_to
--- a/education/windows/images/wsfb_win10_pro_to
+++ b/education/windows/images/wsfb_win10_pro_to
--- a/education/windows/images/wsfb_win10_pro_to_proedu_email_upgrade_link.png
+++ b/education/windows/images/wsfb_win10_pro_to_proedu_email_upgrade_link.png
--- a/windows/deploy/images/ISE.PNG
+++ b/windows/deploy/images/ISE.PNG
--- a/windows/deploy/images/PoC-big.png
+++ b/windows/deploy/images/PoC-big.png
--- a/windows/deploy/images/deploy-finish.PNG
+++ b/windows/deploy/images/deploy-finish.PNG
--- a/windows/deploy/images/disk2vhd-convert.PNG
+++ b/windows/deploy/images/disk2vhd-convert.PNG
--- a/windows/deploy/images/disk2vhd-gen2.PNG
+++ b/windows/deploy/images/disk2vhd-gen2.PNG
--- a/windows/deploy/images/disk2vhd.PNG
+++ b/windows/deploy/images/disk2vhd.PNG
--- a/windows/deploy/images/disk2vhd4.PNG
+++ b/windows/deploy/images/disk2vhd4.PNG
--- a/windows/deploy/images/five.png
+++ b/windows/deploy/images/five.png
--- a/windows/deploy/images/four.png
+++ b/windows/deploy/images/four.png
--- a/windows/deploy/images/icd-create-options.PNG
+++ b/windows/deploy/images/icd-create-options.PNG
--- a/windows/deploy/images/icd-export-menu.png
+++ b/windows/deploy/images/icd-export-menu.png
--- a/windows/deploy/images/icd-install.PNG
+++ b/windows/deploy/images/icd-install.PNG
--- a/windows/deploy/images/icd-multi-target-true.png
+++ b/windows/deploy/images/icd-multi-target-true.png
--- a/windows/deploy/images/icd-multi-targetstate-true.png
+++ b/windows/deploy/images/icd-multi-targetstate-true.png
--- a/windows/deploy/images/icd-runtime.PNG
+++ b/windows/deploy/images/icd-runtime.PNG
--- a/windows/deploy/images/icd-script1.png
+++ b/windows/deploy/images/icd-script1.png
--- a/windows/deploy/images/icd-script2.png
+++ b/windows/deploy/images/icd-script2.png
--- a/windows/deploy/images/icd-setting-help.PNG
+++ b/windows/deploy/images/icd-setting-help.PNG
--- a/windows/deploy/images/icd-settings.PNG
+++ b/windows/deploy/images/icd-settings.PNG
--- a/windows/deploy/images/icd-step1.PNG
+++ b/windows/deploy/images/icd-step1.PNG
--- a/windows/deploy/images/icd-step2.PNG
+++ b/windows/deploy/images/icd-step2.PNG
--- a/windows/deploy/images/icd-step3.PNG
+++ b/windows/deploy/images/icd-step3.PNG
--- a/windows/deploy/images/icd-step4.PNG
+++ b/windows/deploy/images/icd-step4.PNG
--- a/windows/deploy/images/icd-step5.PNG
+++ b/windows/deploy/images/icd-step5.PNG
--- a/windows/deploy/images/icd-switch.PNG
+++ b/windows/deploy/images/icd-switch.PNG
--- a/windows/deploy/images/image.PNG
+++ b/windows/deploy/images/image.PNG
--- a/windows/deploy/images/multi-target.png
+++ b/windows/deploy/images/multi-target.png
--- a/windows/deploy/images/nfc.png
+++ b/windows/deploy/images/nfc.png
--- a/windows/deploy/images/one.png
+++ b/windows/deploy/images/one.png
--- a/windows/deploy/images/package-trust.png
+++ b/windows/deploy/images/package-trust.png
--- a/windows/deploy/images/packages-mobile.png
+++ b/windows/deploy/images/packages-mobile.png
--- a/windows/deploy/images/scanos.PNG
+++ b/windows/deploy/images/scanos.PNG
--- a/windows/deploy/images/sccm-asset.PNG
+++ b/windows/deploy/images/sccm-asset.PNG
--- a/windows/deploy/images/sccm-assets.PNG
+++ b/windows/deploy/images/sccm-assets.PNG
--- a/windows/deploy/images/sccm-client.PNG
+++ b/windows/deploy/images/sccm-client.PNG
--- a/windows/deploy/images/sccm-collection.PNG
+++ b/windows/deploy/images/sccm-collection.PNG
--- a/windows/deploy/images/sccm-install-os.PNG
+++ b/windows/deploy/images/sccm-install-os.PNG
--- a/windows/deploy/images/sccm-post-refresh.PNG
+++ b/windows/deploy/images/sccm-post-refresh.PNG
--- a/windows/deploy/images/sccm-pxe.PNG
+++ b/windows/deploy/images/sccm-pxe.PNG
--- a/windows/deploy/images/sccm-site.PNG
+++ b/windows/deploy/images/sccm-site.PNG
--- a/windows/deploy/images/sccm-software-cntr.PNG
+++ b/windows/deploy/images/sccm-software-cntr.PNG
--- a/windows/deploy/images/six.png
+++ b/windows/deploy/images/six.png
--- a/windows/deploy/images/three.png
+++ b/windows/deploy/images/three.png
--- a/windows/deploy/images/two.png
+++ b/windows/deploy/images/two.png
--- a/windows/deploy/images/upgrade-analytics-unsubscribe.png
+++ b/windows/deploy/images/upgrade-analytics-unsubscribe.png
--- a/windows/deploy/images/win10-set-up-work-or-school.png
+++ b/windows/deploy/images/win10-set-up-work-or-school.png
--- a/windows/keep-secure/images/atp-add-intune-policy.png
+++ b/windows/keep-secure/images/atp-add-intune-policy.png
--- a/windows/keep-secure/images/atp-disableantispyware-regkey.png
+++ b/windows/keep-secure/images/atp-disableantispyware-regkey.png
--- a/windows/keep-secure/images/atp-intune-add-policy.png
+++ b/windows/keep-secure/images/atp-intune-add-policy.png
--- a/windows/keep-secure/images/atp-mdm-onboarding-package.png
+++ b/windows/keep-secure/images/atp-mdm-onboarding-package.png
--- a/windows/keep-secure/images/atp-refresh-token.png
+++ b/windows/keep-secure/images/atp-refresh-token.png
--- a/windows/keep-secure/images/security-stages.png
+++ b/windows/keep-secure/images/security-stages.png
--- a/windows/keep-secure/images/wip-select-column.png
+++ b/windows/keep-secure/images/wip-select-column.png
--- a/windows/keep-secure/images/wip-taskmgr.png
+++ b/windows/keep-secure/images/wip-taskmgr.png
--- a/windows/manage/images/cortana-about-me.png
+++ b/windows/manage/images/cortana-about-me.png
--- a/windows/manage/images/cortana-add-reminder.png
+++ b/windows/manage/images/cortana-add-reminder.png
--- a/windows/manage/images/cortana-chicago-weather.png
+++ b/windows/manage/images/cortana-chicago-weather.png
--- a/windows/manage/images/cortana-complete-send-email-coworker-mic.png
+++ b/windows/manage/images/cortana-complete-send-email-coworker-mic.png
--- a/windows/manage/images/cortana-connect-crm.png
+++ b/windows/manage/images/cortana-connect-crm.png
--- a/windows/manage/images/cortana-connect-o365.png
+++ b/windows/manage/images/cortana-connect-o365.png
--- a/windows/manage/images/cortana-connect-uber.png
+++ b/windows/manage/images/cortana-connect-uber.png
--- a/windows/manage/images/cortana-crm-screen.png
+++ b/windows/manage/images/cortana-crm-screen.png
--- a/windows/manage/images/cortana-feedback.png
+++ b/windows/manage/images/cortana-feedback.png
--- a/Show More
+++ b/Show More