Commit 96918c8e authored by Gervase Markham's avatar Gervase Markham
Browse files

Bug 750294 - back out due to preprocessor not doing what was expected.

parent 3158caae
Loading
Loading
Loading
Loading
+15 −21
Original line number Diff line number Diff line
@@ -30,27 +30,24 @@
#endif
    
    <p>All of the <b>source code</b> to this product is 
       available under licenses which are both 
       <a href="https://developer.mozilla.org/en/Mozilla_Source_Code_%28Mercurial%29">available</a> 
       under licenses which are both 
       <a href="http://www.gnu.org/philosophy/free-sw.html">free</a> and 
       <a href="http://www.opensource.org/docs/definition.php">open source</a>.
#ifdef SOURCE_REPO
#ifdef SOURCE_CHANGESET
       The specific source code for this product is identified by the URL
       <a href="@SOURCE_REPO@/rev/@SOURCE_CHANGESET@">@SOURCE_REPO@/rev/@SOURCE_CHANGESET@</a>,
       and you can read 
       <a href="https://developer.mozilla.org/en/Mozilla_Source_Code_%28Mercurial%29">instructions 
       on how to download and build it for yourself</a>.
#endif
#endif
       Most of it is available under the Mozilla Public License 2.0 (MPL).
    </p>

    <p>More specifically, most of the source code is available under the 
       <a href="about:license#mpl">Mozilla Public License 2.0</a> (MPL).
       The MPL has a 
       <a href="http://www.mozilla.org/MPL/2.0/FAQ.html">FAQ</a> to help
       you understand it. The remainder of the software which is not 
       under the MPL is available under one of a variety of other 
       permissive licenses. Those that require reproduction 
    <ul>
      <li><a href="about:license#mpl">Mozilla Public License 2.0</a>
      <ul>
        <li><a href="http://www.mozilla.org/MPL/2.0/FAQ.html">MPL 2.0 FAQ</a></li>
      </ul>
      </li>
    </ul>
    
    <p>The remainder of the software which is not under the MPL is available
       under one of
       a variety of other licenses. Those that require reproduction 
       of the license text in the distribution are given below. 
       (Note: your copy of this product may not contain code covered by one 
       or more of the licenses listed here, depending on the exact product 
@@ -58,9 +55,6 @@
    </p>
    
    <ul>
      <li><a href="about:license#mpl">Mozilla Public License 2.0</a>
      <br><br>
      </li>
      <li><a href="about:license#android">Android Open Source License</a></li>
      <li><a href="about:license#angle">ANGLE License</a></li>
      <li><a href="about:license#apache">Apache License 2.0</a></li>