mirror of
https://github.com/MicrosoftDocs/windows-itpro-docs.git
synced 2025-06-30 17:53:53 +00:00
Merge pull request #1630 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/windows-itpro-docs (branch public)
This commit is contained in:
@ -157,13 +157,13 @@ This table includes the attributes used by the Enterprise Mode schema.
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td><version></td>
|
<td>version</td>
|
||||||
<td>Specifies the version of the Enterprise Mode Site List. This attribute is supported for the <rules> element.</td>
|
<td>Specifies the version of the Enterprise Mode Site List. This attribute is supported for the <rules> element.</td>
|
||||||
<td>Internet Explorer 11 and Microsoft Edge</td>
|
<td>Internet Explorer 11 and Microsoft Edge</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><exclude></td>
|
<td>exclude</td>
|
||||||
<td>Specifies the domain or path excluded from applying the behavior and is supported on the <domain> and <path> elements.
|
<td>Specifies the domain or path is excluded from applying Enterprise Mode. This attribute is only supported on the <domain> and <path> elements in the <emie> section.
|
||||||
<p><b>Example</b>
|
<p><b>Example</b>
|
||||||
<pre class="syntax">
|
<pre class="syntax">
|
||||||
<emie>
|
<emie>
|
||||||
@ -175,7 +175,7 @@ Where <a href="https://fabrikam.com" data-raw-source="https://fabrikam.com">http
|
|||||||
<td>Internet Explorer 11 and Microsoft Edge</td>
|
<td>Internet Explorer 11 and Microsoft Edge</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><docMode></td>
|
<td>docMode</td>
|
||||||
<td>Specifies the document mode to apply. This attribute is only supported on <domain> or <path> elements in the <docMode> section.
|
<td>Specifies the document mode to apply. This attribute is only supported on <domain> or <path> elements in the <docMode> section.
|
||||||
<p><b>Example</b>
|
<p><b>Example</b>
|
||||||
<pre class="syntax">
|
<pre class="syntax">
|
||||||
|
@ -46,19 +46,19 @@ The following is an example of the v.2 version of the Enterprise Mode schema.
|
|||||||
|
|
||||||
```xml
|
```xml
|
||||||
<site-list version="205">
|
<site-list version="205">
|
||||||
<!--- File creation header --->
|
<!-- File creation header -->
|
||||||
<created-by>
|
<created-by>
|
||||||
<tool>EnterpriseSitelistManager</tool>
|
<tool>EnterpriseSitelistManager</tool>
|
||||||
<version>10240</version>
|
<version>10240</version>
|
||||||
<date-created>20150728.135021</date-created>
|
<date-created>20150728.135021</date-created>
|
||||||
</created-by>
|
</created-by>
|
||||||
<!--- Begin Site List --->
|
<!-- Begin Site List -->
|
||||||
<site url="www.cpandl.com">
|
<site url="www.cpandl.com">
|
||||||
<compat-mode>IE8Enterprise</compat-mode>
|
<compat-mode>IE8Enterprise</compat-mode>
|
||||||
<open-in>MSEdge</open-in>
|
<open-in>MSEdge</open-in>
|
||||||
</site>
|
</site>
|
||||||
<site url="www.woodgrovebank.com">
|
<site url="www.woodgrovebank.com">
|
||||||
<compat-mode>default</compat-mode>
|
<compat-mode>Default</compat-mode>
|
||||||
<open-in>IE11</open-in>
|
<open-in>IE11</open-in>
|
||||||
</site>
|
</site>
|
||||||
<site url="adatum.com">
|
<site url="adatum.com">
|
||||||
@ -66,14 +66,15 @@ The following is an example of the v.2 version of the Enterprise Mode schema.
|
|||||||
<open-in>IE11</open-in>
|
<open-in>IE11</open-in>
|
||||||
</site>
|
</site>
|
||||||
<site url="contoso.com">
|
<site url="contoso.com">
|
||||||
<compat-mode>default</compat-mode>
|
<compat-mode>Default</compat-mode>
|
||||||
<open-in>IE11</open-in>
|
<open-in>IE11</open-in>
|
||||||
</site>
|
</site>
|
||||||
<site url="relecloud.com"/>
|
<site url="relecloud.com"/>
|
||||||
<compat-mode>default</compat-mode>
|
<compat-mode>Default</compat-mode>
|
||||||
<open-in>none</open-in>
|
<open-in>None</open-in>
|
||||||
<site url="relecloud.com/about">
|
<site url="relecloud.com/about">
|
||||||
<compat-mode>IE8Enterprise"</compat-mode>
|
<compat-mode>IE8Enterprise"</compat-mode>
|
||||||
|
<open-in>None</open-in>
|
||||||
</site>
|
</site>
|
||||||
<site url="contoso.com/travel">
|
<site url="contoso.com/travel">
|
||||||
<compat-mode>IE7</compat-mode>
|
<compat-mode>IE7</compat-mode>
|
||||||
@ -232,26 +233,26 @@ These v.1 version schema attributes have been deprecated in the v.2 version of t
|
|||||||
<table>
|
<table>
|
||||||
<thead>
|
<thead>
|
||||||
<tr class="header">
|
<tr class="header">
|
||||||
<th>Deprecated attribute</th>
|
<th>Deprecated element/attribute</th>
|
||||||
<th>New attribute</th>
|
<th>New element</th>
|
||||||
<th>Replacement example</th>
|
<th>Replacement example</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td><forceCompatView></td>
|
<td>forceCompatView</td>
|
||||||
<td><compat-mode></td>
|
<td><compat-mode></td>
|
||||||
<td>Replace <forceCompatView="true"> with <compat-mode>IE7Enterprise</compat-mode></td>
|
<td>Replace forceCompatView="true" with <compat-mode>IE7Enterprise</compat-mode></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><docMode></td>
|
<td>docMode</td>
|
||||||
<td><compat-mode></td>
|
<td><compat-mode></td>
|
||||||
<td>Replace <docMode="IE5"> with <compat-mode>IE5</compat-mode></td>
|
<td>Replace docMode="IE5" with <compat-mode>IE5</compat-mode></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><doNotTransition></td>
|
<td>doNotTransition</td>
|
||||||
<td><open-in></td>
|
<td><open-in></td>
|
||||||
<td>Replace <doNotTransition="true"> with <open-in>none</open-in></td>
|
<td>Replace doNotTransition="true" with <open-in>none</open-in></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><domain> and <path></td>
|
<td><domain> and <path></td>
|
||||||
@ -259,25 +260,28 @@ These v.1 version schema attributes have been deprecated in the v.2 version of t
|
|||||||
<td>Replace:
|
<td>Replace:
|
||||||
<pre class="syntax">
|
<pre class="syntax">
|
||||||
<emie>
|
<emie>
|
||||||
<domain exclude="false">contoso.com</domain>
|
<domain>contoso.com</domain>
|
||||||
</emie></pre>
|
</emie></pre>
|
||||||
With:
|
With:
|
||||||
<pre class="syntax">
|
<pre class="syntax">
|
||||||
<site url="contoso.com"/>
|
<site url="contoso.com"/>
|
||||||
<compat-mode>IE8Enterprise</compat-mode>
|
<compat-mode>IE8Enterprise</compat-mode>
|
||||||
|
<open-in>IE11</open-in>
|
||||||
</site></pre>
|
</site></pre>
|
||||||
<b>-AND-</b><p>
|
<b>-AND-</b><p>
|
||||||
Replace:
|
Replace:
|
||||||
<pre class="syntax">
|
<pre class="syntax">
|
||||||
<emie>
|
<emie>
|
||||||
<domain exclude="true">contoso.com
|
<domain exclude="true" doNotTransition="true">
|
||||||
<path exclude="false" forceCompatView="true">/about</path>
|
contoso.com
|
||||||
|
<path forceCompatView="true">/about</path>
|
||||||
</domain>
|
</domain>
|
||||||
</emie></pre>
|
</emie></pre>
|
||||||
With:
|
With:
|
||||||
<pre class="syntax">
|
<pre class="syntax">
|
||||||
<site url="contoso.com/about">
|
<site url="contoso.com/about">
|
||||||
<compat-mode>IE7Enterprise</compat-mode>
|
<compat-mode>IE7Enterprise</compat-mode>
|
||||||
|
<open-in>IE11</open-in>
|
||||||
</site></pre></td>
|
</site></pre></td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
@ -71,19 +71,19 @@ This is a view of the [raw EMIE v2 schema.xml file](https://gist.github.com/kypf
|
|||||||
|
|
||||||
```xml
|
```xml
|
||||||
<site-list version="205">
|
<site-list version="205">
|
||||||
<!--- File creation header --->
|
<!-- File creation header -->
|
||||||
<created-by>
|
<created-by>
|
||||||
<tool>EnterpriseSiteListManager</tool>
|
<tool>EnterpriseSiteListManager</tool>
|
||||||
<version>10586</version>
|
<version>10586</version>
|
||||||
<date-created>20150728.135021</date-created>
|
<date-created>20150728.135021</date-created>
|
||||||
</created-by>
|
</created-by>
|
||||||
<!--- Begin Site List --->
|
<!-- Begin Site List -->
|
||||||
<site url="www.cpandl.com">
|
<site url="www.cpandl.com">
|
||||||
<compat-mode>IE8Enterprise</compat-mode>
|
<compat-mode>IE8Enterprise</compat-mode>
|
||||||
<open-in>IE11</open-in>
|
<open-in>IE11</open-in>
|
||||||
</site>
|
</site>
|
||||||
<site url="www.woodgrovebank.com">
|
<site url="www.woodgrovebank.com">
|
||||||
<compat-mode>default</compat-mode>
|
<compat-mode>Default</compat-mode>
|
||||||
<open-in>IE11</open-in>
|
<open-in>IE11</open-in>
|
||||||
</site>
|
</site>
|
||||||
<site url="adatum.com">
|
<site url="adatum.com">
|
||||||
@ -92,8 +92,8 @@ This is a view of the [raw EMIE v2 schema.xml file](https://gist.github.com/kypf
|
|||||||
</site>
|
</site>
|
||||||
<site url="relecloud.com"/>
|
<site url="relecloud.com"/>
|
||||||
<!-- default for self-closing XML tag is
|
<!-- default for self-closing XML tag is
|
||||||
<compat-mode>default</compat-mode>
|
<compat-mode>Default</compat-mode>
|
||||||
<open-in>none</open-in>
|
<open-in>None</open-in>
|
||||||
-->
|
-->
|
||||||
<site url="relecloud.com/products">
|
<site url="relecloud.com/products">
|
||||||
<compat-mode>IE8Enterprise"</compat-mode>
|
<compat-mode>IE8Enterprise"</compat-mode>
|
||||||
|
@ -6,7 +6,7 @@ ms.mktglfcycl:
|
|||||||
audience: itpro
|
audience: itpro
|
||||||
itproauthor: jaimeo
|
itproauthor: jaimeo
|
||||||
author: jaimeo
|
author: jaimeo
|
||||||
ms.localizationprioauthor: jaimeo
|
ms.localizationpriority: medium
|
||||||
ms.audience: itpro
|
ms.audience: itpro
|
||||||
author: jaimeo
|
author: jaimeo
|
||||||
ms.date: 09/18/2018
|
ms.date: 09/18/2018
|
||||||
|
Reference in New Issue
Block a user