Bug 730814 - Add "mpl" anchor.

This commit is contained in:
Gervase Markham 2012-03-06 11:54:20 +00:00
Родитель 3bc60b9847
Коммит 8e170a10fe
1 изменённых файлов: 23 добавлений и 15 удалений

Просмотреть файл

@ -109,7 +109,7 @@
<li><a href="about:license#other-notices">Other Required Notices</a>
<li><a href="about:license#optional-notices">Optional Notices</a>
#ifdef XP_WIN
<li><a href="about:license#proprietary-notices">Proprietary Operating System Libraries</a>
<li><a href="about:license#proprietary-notices">Proprietary Operating System Components</a>
#endif
</ul>
@ -117,7 +117,7 @@
<hr>
<h1 id="mozilla-public-license-version-2.0">Mozilla Public License 2.0</h1>
<h1 id="mpl">Mozilla Public License 2.0</h1>
<h2 id="definitions">1. Definitions</h2>
@ -2622,30 +2622,38 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
that specific operating system. The following license statements
apply to such inclusions.</p>
<h2><a id="directx"></a>Microsoft Windows: Microsoft DirectX License</h2>
<h2><a id="directx"></a>Microsoft Windows: 'Microsoft Distributable Code' License</h2>
<p>This license applies to the following files;
they are referred to below as "Distributable Code":
<span class="path">d3dx9_*.dll</span> and <span class="path">d3dcompiler_*.dll</span>.</p>
<ul>
<li><span class="path">d3d*.dll</span> (Direct3D libraries)</li>
<li><span class="path">msvc*.dll</span> (C and C++ runtime libraries)</li>
</ul>
</p>
<pre>
Copyright (c) Microsoft Corporation.
The Distributable Code may be used and distributed only if you comply with the
following terms: (i) You may use, copy, and distribute the Distributable Code
only as part of this product; (ii) You may not use the Distributable Code on a
platform other than Windows; (iii) You may not alter any copyright, trademark
or patent notice in the Distributable Code; (iv) You may not modify or
distribute the source code of any Distributable Code so that any part of the
source code becomes subject to the MPL or any other copyleft license; (v) You
must comply with any technical limitations in the Distributable Code that only
allow you to use it in certain ways; and (vi) You must comply with all domestic
and international export laws and regulations that apply to the Distributable
Code.
following terms:
(i) You may use, copy, and distribute the Distributable Code only as part of
this product;
(ii) You may not use the Distributable Code on a platform other than Windows;
(iii) You may not alter any copyright, trademark or patent notice in the
Distributable Code;
(iv) You may not modify or distribute the source code of any Distributable
Code so that any part of the source code becomes subject to the MPL or
any other copyleft license;
(v) You must comply with any technical limitations in the Distributable Code
that only allow you to use it in certain ways; and
(vi) You must comply with all domestic and international export laws and
regulations that apply to the Distributable Code.
</pre>
#endif
<hr>