Bug 730814- back out last set of changes; there was another patch caught up in there.
authorGervase Markham <gerv@gerv.net>
Tue, 06 Mar 2012 17:01:11 +0000
changeset 88381 ebf2368191e48c5592acface8045b753cfe302a0
parent 88380 aedd81f5104026469f611103073a7f61df0cc1fb
child 88382 a66cd5f0790e1d4e1f7a50622f665507280446dd
push id22194
push usermak77@bonardo.net
push dateWed, 07 Mar 2012 09:33:54 +0000
treeherdermozilla-central@8ef88a69f861 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs730814
milestone13.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 730814- back out last set of changes; there was another patch caught up in there.
toolkit/content/license.html
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -104,25 +104,25 @@
     </ul>
 
 <br>
 
     <ul>      
       <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 Components</a>
+      <li><a href="about:license#proprietary-notices">Proprietary Operating System Libraries</a>
 #endif    
     </ul>
     
     </div>
     
     <hr>
 
-  <h1 id="mpl">Mozilla Public License 2.0</h1>
+  <h1 id="mozilla-public-license-version-2.0">Mozilla Public License 2.0</h1>
 
   <h2 id="definitions">1. Definitions</h2>
 
   <dl>
     <dt>1.1. "Contributor"</dt>
 
     <dd>
       <p>means each individual or legal entity that creates, contributes to
@@ -2617,48 +2617,40 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     <p>Under some circumstances, under our
     <a href="http://www.mozilla.org/foundation/licensing/binary-components/">binary components policy</a>,
     Mozilla may decide to include additional
     operating system vendor code with the installer of our products designed
     for that vendor's proprietary platform, to make our products work well on
     that specific operating system. The following license statements
     apply to such inclusions.</p>
     
-    <h2><a id="directx"></a>Microsoft Windows: 'Microsoft Distributable Code' License</h2>
+    <h2><a id="directx"></a>Microsoft Windows: Microsoft DirectX License</h2>
 
     <p>This license applies to the following files;
     they are referred to below as "Distributable Code":
-      <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>
+    <span class="path">d3dx9_*.dll</span> and <span class="path">d3dcompiler_*.dll</span>.</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>
     
     <p><a href="about:license#top">Return to top</a>.</p>
     
   </body>
 </html>