Merge branch 'master' into atp-mac

This commit is contained in:
Denise Vangel-MSFT
2019-12-04 13:27:49 -08:00
28 changed files with 95 additions and 88 deletions

View File

@ -157,13 +157,13 @@ This table includes the attributes used by the Enterprise Mode schema.
</thead>
<tbody>
<tr>
<td>&lt;version&gt;</td>
<td>version</td>
<td>Specifies the version of the Enterprise Mode Site List. This attribute is supported for the &lt;rules&gt; element.</td>
<td>Internet Explorer 11 and Microsoft Edge</td>
</tr>
<tr>
<td>&lt;exclude&gt;</td>
<td>Specifies the domain or path excluded from applying the behavior and is supported on the &lt;domain&gt; and &lt;path&gt; elements.
<td>exclude</td>
<td>Specifies the domain or path is excluded from applying Enterprise Mode. This attribute is only supported on the &lt;domain&gt; and &lt;path&gt; elements in the &lt;emie&gt; section.
<p><b>Example</b>
<pre class="syntax">
&lt;emie&gt;
@ -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>
</tr>
<tr>
<td>&lt;docMode&gt;</td>
<td>docMode</td>
<td>Specifies the document mode to apply. This attribute is only supported on &lt;domain&gt; or &lt;path&gt; elements in the &lt;docMode&gt; section.
<p><b>Example</b>
<pre class="syntax">

View File

@ -46,19 +46,19 @@ The following is an example of the v.2 version of the Enterprise Mode schema.
```xml
<site-list version="205">
<!--- File creation header --->
<!-- File creation header -->
<created-by>
<tool>EnterpriseSitelistManager</tool>
<version>10240</version>
<date-created>20150728.135021</date-created>
</created-by>
<!--- Begin Site List --->
<!-- Begin Site List -->
<site url="www.cpandl.com">
<compat-mode>IE8Enterprise</compat-mode>
<open-in>MSEdge</open-in>
</site>
<site url="www.woodgrovebank.com">
<compat-mode>default</compat-mode>
<compat-mode>Default</compat-mode>
<open-in>IE11</open-in>
</site>
<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>
</site>
<site url="contoso.com">
<compat-mode>default</compat-mode>
<compat-mode>Default</compat-mode>
<open-in>IE11</open-in>
</site>
<site url="relecloud.com"/>
<compat-mode>default</compat-mode>
<open-in>none</open-in>
<compat-mode>Default</compat-mode>
<open-in>None</open-in>
<site url="relecloud.com/about">
<compat-mode>IE8Enterprise"</compat-mode>
<open-in>None</open-in>
</site>
<site url="contoso.com/travel">
<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>
<thead>
<tr class="header">
<th>Deprecated attribute</th>
<th>New attribute</th>
<th>Deprecated element/attribute</th>
<th>New element</th>
<th>Replacement example</th>
</tr>
</thead>
<tbody>
<tr>
<td>&lt;forceCompatView&gt;</td>
<td>forceCompatView</td>
<td>&lt;compat-mode&gt;</td>
<td>Replace &lt;forceCompatView=&quot;true&quot;&gt; with &lt;compat-mode&gt;IE7Enterprise&lt;/compat-mode&gt;</td>
<td>Replace forceCompatView=&quot;true&quot; with &lt;compat-mode&gt;IE7Enterprise&lt;/compat-mode&gt;</td>
</tr>
<tr>
<td>&lt;docMode&gt;</td>
<td>docMode</td>
<td>&lt;compat-mode&gt;</td>
<td>Replace &lt;docMode=&quot;IE5&quot;&gt; with &lt;compat-mode&gt;IE5&lt;/compat-mode&gt;</td>
<td>Replace docMode=&quot;IE5&quot; with &lt;compat-mode&gt;IE5&lt;/compat-mode&gt;</td>
</tr>
<tr>
<td>&lt;doNotTransition&gt;</td>
<td>doNotTransition</td>
<td>&lt;open-in&gt;</td>
<td>Replace &lt;doNotTransition=&quot;true&quot;&gt; with &lt;open-in&gt;none&lt;/open-in&gt;</td>
<td>Replace doNotTransition=&quot;true&quot; with &lt;open-in&gt;none&lt;/open-in&gt;</td>
</tr>
<tr>
<td>&lt;domain&gt; and &lt;path&gt;</td>
@ -259,25 +260,28 @@ These v.1 version schema attributes have been deprecated in the v.2 version of t
<td>Replace:
<pre class="syntax">
&lt;emie&gt;
&lt;domain exclude=&quot;false&quot;&gt;contoso.com&lt;/domain&gt;
&lt;domain&gt;contoso.com&lt;/domain&gt;
&lt;/emie&gt;</pre>
With:
<pre class="syntax">
&lt;site url=&quot;contoso.com&quot;/&gt;
&lt;compat-mode&gt;IE8Enterprise&lt;/compat-mode&gt;
&lt;open-in&gt;IE11&lt;/open-in&gt;
&lt;/site&gt;</pre>
<b>-AND-</b><p>
Replace:
<pre class="syntax">
&lt;emie&gt;
&lt;domain exclude=&quot;true&quot;&gt;contoso.com
&lt;path exclude=&quot;false&quot; forceCompatView=&quot;true&quot;&gt;/about&lt;/path&gt;
&lt;domain exclude=&quot;true&quot; doNotTransition=&quot;true&quot;&gt;
contoso.com
&lt;path forceCompatView=&quot;true&quot;&gt;/about&lt;/path&gt;
&lt;/domain&gt;
&lt;/emie&gt;</pre>
With:
<pre class="syntax">
&lt;site url=&quot;contoso.com/about&quot;&gt;
&lt;compat-mode&gt;IE7Enterprise&lt;/compat-mode&gt;
&lt;open-in&gt;IE11&lt;/open-in&gt;
&lt;/site&gt;</pre></td>
</tr>
</table>

View File

@ -71,19 +71,19 @@ This is a view of the [raw EMIE v2 schema.xml file](https://gist.github.com/kypf
```xml
<site-list version="205">
<!--- File creation header --->
<!-- File creation header -->
<created-by>
<tool>EnterpriseSiteListManager</tool>
<version>10586</version>
<date-created>20150728.135021</date-created>
</created-by>
<!--- Begin Site List --->
<!-- Begin Site List -->
<site url="www.cpandl.com">
<compat-mode>IE8Enterprise</compat-mode>
<open-in>IE11</open-in>
</site>
<site url="www.woodgrovebank.com">
<compat-mode>default</compat-mode>
<compat-mode>Default</compat-mode>
<open-in>IE11</open-in>
</site>
<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 url="relecloud.com"/>
<!-- default for self-closing XML tag is
<compat-mode>default</compat-mode>
<open-in>none</open-in>
<compat-mode>Default</compat-mode>
<open-in>None</open-in>
-->
<site url="relecloud.com/products">
<compat-mode>IE8Enterprise"</compat-mode>