diff --git a/browsers/internet-explorer/ie11-deploy-guide/enterprise-mode-schema-version-1-guidance.md b/browsers/internet-explorer/ie11-deploy-guide/enterprise-mode-schema-version-1-guidance.md index e78df6c4c1..16c87cb775 100644 --- a/browsers/internet-explorer/ie11-deploy-guide/enterprise-mode-schema-version-1-guidance.md +++ b/browsers/internet-explorer/ie11-deploy-guide/enterprise-mode-schema-version-1-guidance.md @@ -224,75 +224,9 @@ In this example, `contoso.com/about/careers` will use the default version of Int ## How to target specific sites If you want to target specific sites in your organization. - - - - - - - - - - - - - - - - - - - - - - - - - -
Targeted siteExampleExplanation
You can specify subdomains in the domain tag -
-<docMode>
-  <domain docMode="5">contoso.com</domain>
-  <domain docMode="9">info.contoso.com</domain>
-<docMode>
 -
    -
  • contoso.com uses document mode 5.
    • -
  • info.contoso.com uses document mode 9.
    • -
  • test.contoso.com also uses document mode 5.
    • -
-
You can specify exact URLs by listing the full path -
-<emie>
-  <domain exclude="false">bing.com</domain>
-  <domain exclude="false" forceCompatView="true">contoso.com</domain>
-<emie>
 -
    -
  • bing.com uses IE8 Enterprise Mode.
    • -
  • contoso.com uses IE7 Enterprise Mode.
    • -
-
You can nest paths underneath domains -
-<emie>
-  <domain exclude="true">contoso.com
-    <path exclude="false">/about</path>
-    <path exclude="true">/about/business</path>
-  </domain>
-</emie>
 -
    -
  • contoso.com will use the default version of IE.
    • -
  • contoso.com/about and everything underneath that node will load in Enterprise Mode, except contoso.com/about/business, which will load in the default version of IE.
    • -
-
You can’t add a path underneath a path. The file will still be parsed, but the sub-path will be ignored -
-<emie>
-  <domain exclude="true">contoso.com
-    <path>/about
-    <path exclude="true">/business</path>
-    </path>
-  </domain>
-</emie>
 -
    -
  • contoso.com will use the default version of IE.
    • -
  • contoso.com/about and everything underneath that node will load in Enterprise Mode, including contoso.com/about/business because the last rule is ignored.
    • -
-
\ No newline at end of file +|Targeted site |Example |Explanation | +|--------------|--------|------------| +|You can specify subdomains in the domain tag. |<docMode>
<domain docMode="5">contoso.com</domain>
<domain docMode="9">info.contoso.com</domain>
<docMode> || +|You can specify exact URLs by listing the full path. |<emie>
<domain exclude="false">bing.com</domain>
<domain exclude="false" forceCompatView="true">contoso.com</domain>
<emie>|| +|You can nest paths underneath domains. |<emie>
<domain exclude="true">contoso.com
<path exclude="false">/about</path>
<path exclude="true">
/about/business</path>
</domain>
</emie> | | +|You can’t add a path underneath a path. The file will still be parsed, but the sub-path will be ignored. |<emie>
<domain exclude="true">contoso.com
<path>/about
<path exclude="true">/business</path>
</path>
</domain>
</emie> | | \ No newline at end of file diff --git a/windows/whats-new/whats-new-windows-10-version-1703.md b/windows/whats-new/whats-new-windows-10-version-1703.md index 73e50ea512..1ece933e01 100644 --- a/windows/whats-new/whats-new-windows-10-version-1703.md +++ b/windows/whats-new/whats-new-windows-10-version-1703.md @@ -75,6 +75,8 @@ Cortana is Microsoft’s personal digital assistant, who helps busy people get t Using Azure AD also means that you can remove an employee’s profile (for example, when an employee leaves your organization) while respecting Windows Information Protection (WIP) policies and ignoring enterprise content, such as emails, calendar items, and people lists that are marked as enterprise data. +For more info about Cortana at work, see (../configure/cortana-at-work-overview.md) + ## Deployment