Changeset 1944

Show
Ignore:
Timestamp:
12/04/2008 08:41:12 AM (5 weeks ago)
Author:
otter
Message:

ModelicaLicense2 links corrected (since changes on Modelica web)

Location:
Modelica_Fluid/branches/StreamConnector/Modelica_Fluid
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • Modelica_Fluid/branches/StreamConnector/Modelica_Fluid/ModelicaLicense2.html

    r1693 r1944  
    3636   <A HREF="#1. The Modelica License 2|outline">             The Modelica License 2</A> 
    3737   (in other formats:  
    38    <A HREF="http://www.modelica.org/modelica-legal-documents/ModelicaLicense2-standalone.html">standalone html</A>, 
    39    <A HREF="http://www.modelica.org/modelica-legal-documents/ModelicaLicense2.mo">mo</A>, 
    40    <A HREF="http://www.modelica.org/modelica-legal-documents/ModelicaLicense2.pdf">pdf</A>,  
    41    <A HREF="http://www.modelica.org/modelica-legal-documents/ModelicaLicense2.odt">odt</A>,  
    42    <A HREF="http://www.modelica.org/modelica-legal-documents/ModelicaLicense2.doc">doc</A>)</FONT></BR> 
     38   <A HREF="http://www.modelica.org/licenses/ModelicaLicense2.html">standalone html</A>, 
     39   <A HREF="http://www.modelica.org/licenses/ModelicaLicense2.mo">mo</A>, 
     40   <A HREF="http://www.modelica.org/licenses/ModelicaLicense2.pdf">pdf</A>,  
     41   <A HREF="http://www.modelica.org/licenses/ModelicaLicense2.odt">odt</A>,  
     42   <A HREF="http://www.modelica.org/licenses/ModelicaLicense2.doc">doc</A>)</FONT></BR> 
    4343   <A HREF="#2. How to Apply the Modelica License 2|outline">How to Apply the Modelica License 2</A></FONT></BR> 
    4444         <A HREF="#3. Frequently Asked Questions|outline">         Frequently Asked Questions</A></FONT></P> 
     
    347347<A HREF="modelica://Library.UsersGuide.ModelicaLicense2">here</A></U> 
    348348or at 
    349 <A HREF="http://www.modelica.org/modelica-legal-documents/ModelicaLicense2.html"> 
    350 http://www.modelica.org/modelica-legal-documents/ModelicaLicense2.html</A>.</I></P> 
     349<A HREF="http://www.modelica.org/licenses/ModelicaLicense2"> 
     350http://www.modelica.org/licenses/ModelicaLicense2</A>.</I></P> 
    351351 
    352352<P CLASS="western" STYLE="text-indent: 0pt; font-weight: medium">Include 
    353353a copy of the Modelica License 2 under 
    354354<B>&lt;library&gt;.UsersGuide.ModelicaLicense2</B>  
    355 (use <A HREF="http://www.modelica.org/modelica-legal-documents/ModelicaLicense2.mo"> 
    356 http://www.modelica.org/modelica-legal-documents/ModelicaLicense2.mo</A>).  
     355(use <A HREF="http://www.modelica.org/licenses/ModelicaLicense2.mo"> 
     356http://www.modelica.org/licenses/ModelicaLicense2.mo</A>).  
    357357Furthermore, add 
    358358the list of authors and contributors under 
     
    377377<A HREF="modelica://Modelica.UsersGuide.ModelicaLicense2">here</A></U> 
    378378or at 
    379 <A HREF="http://www.modelica.org/modelica-legal-documents/ModelicaLicense2.html"> 
    380 http://www.modelica.org/modelica-legal-documents/ModelicaLicense2.html</A>.</I></P> 
     379<A HREF="http://www.modelica.org/licenses/ModelicaLicense2"> 
     380http://www.modelica.org/licenses/ModelicaLicense2</A>.</I></P> 
    381381 
    382382<P CLASS="western" STYLE="text-indent: 0pt; font-weight: medium">For 
     
    391391these cases, save a copy of the Modelica License 2 in one directory 
    392392of the distribution, e.g.,  
    393 <A HREF="http://www.modelica.org/modelica-legal-documents/ModelicaLicense2-standalone.html"> 
    394 http://www.modelica.org/modelica-legal-documents/ModelicaLicense2-standalone.html</A> 
     393<A HREF="http://www.modelica.org/licenses/ModelicaLicense2.html"> 
     394http://www.modelica.org/licenses/ModelicaLicense2.html</A> 
    395395in directory <B>&lt;library&gt;/help/documentation/ModelicaLicense2.html</B>. 
    396396</P> 
  • Modelica_Fluid/branches/StreamConnector/Modelica_Fluid/package.mo

    r1927 r1944  
    14161416  class ModelicaLicense2 "Modelica License 2" 
    14171417 
    1418     annotation (Documentation(info="<html> 
    1419   
     1418      annotation (Documentation(info="<html> 
     1419 
    14201420<P STYLE=\"text-indent: 0pt; font-weight: medium\"> 
    14211421This page contains the &ldquo;Modelica License 2&rdquo; which was 
     
    14271427how to apply the license and has a &ldquo;Frequently Asked Questions&rdquo; 
    14281428section.</P> 
    1429   
     1429 
    14301430<P STYLE=\"text-indent: 0pt; line-height: 150%\"> 
    14311431<A HREF=\"#1. The Modelica License 2|outline\">             The Modelica License 2</A> 
    14321432   (in other formats:  
    1433    <A HREF=\"http://www.modelica.org/modelica-legal-documents/ModelicaLicense2-standalone.html\">standalone html</A>, 
    1434    <A HREF=\"http://www.modelica.org/modelica-legal-documents/ModelicaLicense2.pdf\">pdf</A>, 
    1435    <A HREF=\"http://www.modelica.org/modelica-legal-documents/ModelicaLicense2.odt\">odt</A>, 
    1436    <A HREF=\"http://www.modelica.org/modelica-legal-documents/ModelicaLicense2.doc\">doc</A>)<br> 
     1433   <A HREF=\"http://www.modelica.org/licenses/ModelicaLicense2.html\">standalone html</A>, 
     1434   <A HREF=\"http://www.modelica.org/licenses/ModelicaLicense2.pdf\">pdf</A>, 
     1435   <A HREF=\"http://www.modelica.org/licenses/ModelicaLicense2.odt\">odt</A>, 
     1436   <A HREF=\"http://www.modelica.org/licenses/ModelicaLicense2.doc\">doc</A>)<br> 
    14371437   <A HREF=\"#2. How to Apply the Modelica License 2|outline\">How to Apply the Modelica License 2</A><br> 
    14381438   <A HREF=\"#3. Frequently Asked Questions|outline\">         Frequently Asked Questions</A><br>&nbsp;</P> 
    1439   
     1439 
    14401440<hr> 
    14411441<H4><A NAME=\"_Ref208223390\"></A><A NAME=\"1. The Modelica License 2|outline\"></A> 
    14421442The Modelica License 2</H4> 
    1443   
     1443 
    14441444<P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    14451445<B>Preamble. </B>The goal of this license is that Modelica related 
     
    14601460Definitions.</B></P> 
    14611461<OL style=\"list-style-type:lower-latin\"> 
    1462         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    1463         &ldquo;License&rdquo; is this Modelica License.</P> 
    1464         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    1465         &ldquo;Original Work&rdquo; is any work of authorship, including 
    1466         software, images, documents, data files, that contains the above 
    1467         licensing notice or that is packed together with a licensing notice 
    1468         referencing it.</P> 
    1469         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    1470         &ldquo;Licensor&rdquo; is the provider of the Original Work who has 
    1471         placed this licensing notice adjacent to the copyright notice(s) for 
    1472         the Original Work. The Original Work is either directly provided by 
    1473         the owner of the Original Work, or by a licensee of the owner.</P> 
    1474         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    1475         &ldquo;Derivative Work&rdquo; is any modification of the Original 
    1476         Work which represents, as a whole, an original work of authorship. 
    1477         For the matter of clarity and as examples:  
    1478         </P> 
    1479         <OL style=\"list-style-type:upper-latin\"> 
    1480                 <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    1481                 Derivative Work shall not include work that remains separable from 
    1482                 the Original Work, as well as merely extracting a part of the 
    1483                 Original Work without modifying it.</P> 
    1484                 <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    1485                 Derivative Work shall not include (a) fixing of errors and/or (b) 
    1486                 adding vendor specific Modelica annotations and/or (c) using a 
    1487                 subset of the classes of a Modelica package, and/or (d) using a 
    1488                 different representation, e.g., a binary representation.</P> 
    1489                 <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    1490                 Derivative Work shall include classes that are copied from the 
    1491                 Original Work where declarations, equations or the documentation 
    1492                 are modified.  
    1493                 </P> 
    1494                 <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    1495                 Derivative Work shall include executables to simulate the models 
    1496                 that are generated by a Modelica translator based on the Original 
    1497                 Work (of a Modelica package).</P> 
    1498         </OL> 
    1499         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    1500         &ldquo;Modified Work&rdquo; is any modification of the Original Work 
    1501         with the following exceptions: (a) fixing of errors and/or (b) 
    1502         adding vendor specific Modelica annotations and/or (c) using a 
    1503         subset of the classes of a Modelica package, and/or (d) using a 
    1504         different representation, e.g., a binary representation.</P> 
    1505         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    1506         &quot;Source Code&quot; means the preferred form of the Original 
    1507         Work for making modifications to it and all available documentation 
    1508         describing how to modify the Original Work.</P> 
    1509         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    1510         &ldquo;You&rdquo; means an individual or a legal entity exercising 
    1511         rights under, and complying with all of the terms of, this License.  
    1512         </P> 
    1513         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    1514         &ldquo;Modelica package&rdquo; means any Modelica library that is 
    1515         defined with the<BR>&ldquo;<FONT FACE=\"Courier New, monospace\"><FONT SIZE=2 STYLE=\"font-size: 9pt\"><B>package</B></FONT></FONT><FONT FACE=\"Courier New, monospace\"><FONT SIZE=2 STYLE=\"font-size: 9pt\"> 
    1516         &lt;Name&gt; ... </FONT></FONT><FONT FACE=\"Courier New, monospace\"><FONT SIZE=2 STYLE=\"font-size: 9pt\"><B>end</B></FONT></FONT><FONT FACE=\"Courier New, monospace\"><FONT SIZE=2 STYLE=\"font-size: 9pt\"> 
    1517         &lt;Name&gt;;</FONT></FONT>&ldquo; Modelica language element.</P> 
     1462        <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
     1463        &ldquo;License&rdquo; is this Modelica License.</P> 
     1464        <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
     1465        &ldquo;Original Work&rdquo; is any work of authorship, including 
     1466        software, images, documents, data files, that contains the above 
     1467        licensing notice or that is packed together with a licensing notice 
     1468        referencing it.</P> 
     1469        <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
     1470        &ldquo;Licensor&rdquo; is the provider of the Original Work who has 
     1471        placed this licensing notice adjacent to the copyright notice(s) for 
     1472        the Original Work. The Original Work is either directly provided by 
     1473        the owner of the Original Work, or by a licensee of the owner.</P> 
     1474        <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
     1475        &ldquo;Derivative Work&rdquo; is any modification of the Original 
     1476        Work which represents, as a whole, an original work of authorship. 
     1477        For the matter of clarity and as examples:  
     1478        </P> 
     1479        <OL style=\"list-style-type:upper-latin\"> 
     1480                <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
     1481                Derivative Work shall not include work that remains separable from 
     1482                the Original Work, as well as merely extracting a part of the 
     1483                Original Work without modifying it.</P> 
     1484                <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
     1485                Derivative Work shall not include (a) fixing of errors and/or (b) 
     1486                adding vendor specific Modelica annotations and/or (c) using a 
     1487                subset of the classes of a Modelica package, and/or (d) using a 
     1488                different representation, e.g., a binary representation.</P> 
     1489                <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
     1490                Derivative Work shall include classes that are copied from the 
     1491                Original Work where declarations, equations or the documentation 
     1492                are modified.  
     1493                </P> 
     1494                <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
     1495                Derivative Work shall include executables to simulate the models 
     1496                that are generated by a Modelica translator based on the Original 
     1497                Work (of a Modelica package).</P> 
     1498        </OL> 
     1499        <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
     1500        &ldquo;Modified Work&rdquo; is any modification of the Original Work 
     1501        with the following exceptions: (a) fixing of errors and/or (b) 
     1502        adding vendor specific Modelica annotations and/or (c) using a 
     1503        subset of the classes of a Modelica package, and/or (d) using a 
     1504        different representation, e.g., a binary representation.</P> 
     1505        <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
     1506        &quot;Source Code&quot; means the preferred form of the Original 
     1507        Work for making modifications to it and all available documentation 
     1508        describing how to modify the Original Work.</P> 
     1509        <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
     1510        &ldquo;You&rdquo; means an individual or a legal entity exercising 
     1511        rights under, and complying with all of the terms of, this License.  
     1512        </P> 
     1513        <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
     1514        &ldquo;Modelica package&rdquo; means any Modelica library that is 
     1515        defined with the<BR>&ldquo;<FONT FACE=\"Courier New, monospace\"><FONT SIZE=2 STYLE=\"font-size: 9pt\"><B>package</B></FONT></FONT><FONT FACE=\"Courier New, monospace\"><FONT SIZE=2 STYLE=\"font-size: 9pt\"> 
     1516        &lt;Name&gt; ... </FONT></FONT><FONT FACE=\"Courier New, monospace\"><FONT SIZE=2 STYLE=\"font-size: 9pt\"><B>end</B></FONT></FONT><FONT FACE=\"Courier New, monospace\"><FONT SIZE=2 STYLE=\"font-size: 9pt\"> 
     1517        &lt;Name&gt;;</FONT></FONT>&ldquo; Modelica language element.</P> 
    15181518</OL> 
    1519   
     1519 
    15201520<P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    15211521<B>2. </B><B>Grant of Copyright License. </B>Licensor grants You a 
     
    15231523the duration of the copyright, to do the following:</P> 
    15241524<OL style=\"list-style-type:lower-latin\"> 
    1525         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    1526         To reproduce the Original Work in copies, either alone or as part of 
    1527         a collection.</P> 
    1528         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    1529         To create Derivative Works according to Section 1d) of this License.</P> 
    1530         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    1531         To distribute or communicate to the public copies of the <U>Original 
    1532         Work</U> or a <U>Derivative Work</U> under <U>this License</U>. No 
    1533         fee, neither as a copyright-license fee, nor as a selling fee for 
    1534         the copy as such may be charged under this License. Furthermore, a 
    1535         verbatim copy of this License must be included in any copy of the 
    1536         Original Work or a Derivative Work under this License.<BR>      For 
    1537         the matter of clarity, it is permitted A) to distribute or 
    1538         communicate such copies as part of a (possible commercial) 
    1539         collection where other parts are provided under different licenses 
    1540         and a license fee is charged for the other parts only and B) to 
    1541         charge for mere printing and shipping costs.</P> 
    1542         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    1543         To distribute or communicate to the public copies of a <U>Derivative 
    1544         Work</U>, alternatively to Section 2c), under <U>any other license</U> 
    1545         of your choice, especially also under a license for 
    1546         commercial/proprietary software, as long as You comply with Sections 
    1547         3, 4 and 8 below. <BR>      For the matter of clarity, no 
    1548         restrictions regarding fees, either as to a copyright-license fee or 
    1549         as to a selling fee for the copy as such apply.</P> 
    1550         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    1551         To perform the Original Work publicly.</P> 
    1552         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    1553         To display the Original Work publicly.</P> 
     1525        <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
     1526        To reproduce the Original Work in copies, either alone or as part of 
     1527        a collection.</P> 
     1528        <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
     1529        To create Derivative Works according to Section 1d) of this License.</P> 
     1530        <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
     1531        To distribute or communicate to the public copies of the <U>Original 
     1532        Work</U> or a <U>Derivative Work</U> under <U>this License</U>. No 
     1533        fee, neither as a copyright-license fee, nor as a selling fee for 
     1534        the copy as such may be charged under this License. Furthermore, a 
     1535        verbatim copy of this License must be included in any copy of the 
     1536        Original Work or a Derivative Work under this License.<BR>      For 
     1537        the matter of clarity, it is permitted A) to distribute or 
     1538        communicate such copies as part of a (possible commercial) 
     1539        collection where other parts are provided under different licenses 
     1540        and a license fee is charged for the other parts only and B) to 
     1541        charge for mere printing and shipping costs.</P> 
     1542        <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
     1543        To distribute or communicate to the public copies of a <U>Derivative 
     1544        Work</U>, alternatively to Section 2c), under <U>any other license</U> 
     1545        of your choice, especially also under a license for 
     1546        commercial/proprietary software, as long as You comply with Sections 
     1547        3, 4 and 8 below. <BR>      For the matter of clarity, no 
     1548        restrictions regarding fees, either as to a copyright-license fee or 
     1549        as to a selling fee for the copy as such apply.</P> 
     1550        <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
     1551        To perform the Original Work publicly.</P> 
     1552        <LI><P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
     1553        To display the Original Work publicly.</P> 
    15541554</OL> 
    1555   
     1555 
    15561556<P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    15571557<B>3. </B><B>Acceptance. </B>Any use of the Original Work or a 
    15581558Derivative Work, or any action according to either Section 2a) to 2f) 
    15591559above constitutes Your acceptance of this License.</P> 
    1560   
     1560 
    15611561<P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    15621562<B>4. </B><B>Designation of Derivative Works and of Modified Works. 
     
    15691569package, or using another representation, e.g. a binary 
    15701570representation).</P> 
    1571   
     1571 
    15721572<P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    15731573<B>5. </B><B>Grant of Patent License.</B> 
     
    15801580For the matter of clarity, the license regarding Derivative Works covers  
    15811581patent claims to the extent as they are embodied in the Original Work only.</P> 
    1582   
     1582 
    15831583<P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    15841584<B>6. Provision of </B><B>Source Code. </B>Licensor agrees to provide 
     
    15921592package, if encryption allows the copy operation) or (b) request the 
    15931593Source Code from the Licensor who will provide it to You.</P> 
    1594   
     1594 
    15951595<P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    15961596<B>7. </B><B>Exclusions from License Grant. </B>Neither the names of 
     
    16101610different from this License any Original Work that Licensor otherwise 
    16111611would have a right to license.</P> 
    1612   
     1612 
    16131613<P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    16141614<B>8. </B><B>Attribution Rights. </B>You must retain in the Source 
     
    16271627Source Code, the Attribution Notices shall be appropriately 
    16281628displayed, e.g., in the documentation of the Derivative Work.</P> 
    1629   
     1629 
    16301630<P STYLE=\"text-indent: 0pt\"><B>9. </B><B>Disclaimer 
    16311631of Warranty. <BR></B><U><B>The Original Work is provided under this 
     
    16371637essential part of this License. No license to the Original Work is 
    16381638granted by this License except under this disclaimer.</P> 
    1639   
     1639 
    16401640<P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    16411641<B>10. </B><B>Limitation of Liability. </B>Under no circumstances and 
     
    16501650shall not apply to the extent applicable law prohibits such 
    16511651limitation.</P> 
    1652   
     1652 
    16531653<P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    16541654<B>11. </B><B>Termination. </B>This License conditions your rights to 
     
    16611661rights granted to You by this License upon your failure to observe 
    16621662the conditions of this license.</P> 
    1663   
     1663 
    16641664<P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    16651665<B>12. </B><B>Termination for Patent Action. </B>This License shall 
     
    16721672combinations of the Original Work under combination with other 
    16731673software or hardware.</P> 
    1674   
     1674 
    16751675<P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    16761676<B>13. </B><B>Jurisdiction. </B>Any action or suit relating to this 
     
    16841684appropriate jurisdiction. This section shall survive the termination 
    16851685of this License.</P> 
    1686   
     1686 
    16871687<P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    16881688<B>14. </B><B>Attorneys&rsquo; Fees. </B>In any action to enforce the 
     
    16921692incurred in connection with such action, including any appeal of such 
    16931693action. This section shall survive the termination of this License.</P> 
    1694   
     1694 
    16951695<P STYLE=\"text-indent: 0pt; font-weight: medium; widows: 2; orphans: 2\"> 
    16961696<B>15. </B><B>Miscellaneous. </B> 
    16971697</P> 
    16981698<OL style=\"list-style-type:lower-latin\"> 
    1699         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium\">If any 
    1700         provision of this License is held to be unenforceable, such 
    1701         provision shall be reformed only to the extent necessary to make it 
    1702         enforceable.</P> 
    1703         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium\">No verbal 
    1704         ancillary agreements have been made. Changes and additions to this 
    1705         License must appear in writing to be valid. This also applies to 
    1706         changing the clause pertaining to written form.</P> 
    1707         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium\">You may use the 
    1708         Original Work in all ways not otherwise restricted or conditioned by 
    1709         this License or by law, and Licensor promises not to interfere with 
    1710         or be responsible for such uses by You.</P> 
     1699        <LI><P STYLE=\"text-indent: 0pt; font-weight: medium\">If any 
     1700        provision of this License is held to be unenforceable, such 
     1701        provision shall be reformed only to the extent necessary to make it 
     1702        enforceable.</P> 
     1703        <LI><P STYLE=\"text-indent: 0pt; font-weight: medium\">No verbal 
     1704        ancillary agreements have been made. Changes and additions to this 
     1705        License must appear in writing to be valid. This also applies to 
     1706        changing the clause pertaining to written form.</P> 
     1707        <LI><P STYLE=\"text-indent: 0pt; font-weight: medium\">You may use the 
     1708        Original Work in all ways not otherwise restricted or conditioned by 
     1709        this License or by law, and Licensor promises not to interfere with 
     1710        or be responsible for such uses by You.</P> 
    17111711</OL> 
    1712   
     1712 
    17131713<hr> 
    1714   
     1714 
    17151715<H4><A NAME=\"2. How to Apply the Modelica License 2|outline\"></A> 
    17161716How to Apply the Modelica License 2</H4> 
    1717   
     1717 
    17181718<P STYLE=\"text-indent: 0pt; font-weight: medium\"> 
    17191719At the top level of your Modelica package and at every important 
    17201720subpackage, add the following notices in the info layer of the 
    17211721package:</P> 
    1722   
     1722 
    17231723<table border=\"0\"><tr><td>&nbsp;&nbsp;&nbsp;</td><td> 
    17241724Licensed by &lt;Licensor&gt; under the Modelica License 2<br> 
     
    17261726holder(s)&gt;.  
    17271727</td></tr></table> 
    1728   
     1728 
    17291729<table border=\"0\"><tr><td>&nbsp;&nbsp;&nbsp;</td><td> 
    17301730<I>This Modelica package is <U>free</U> software and 
     
    17351735<A HREF=\"modelica://Library.UsersGuide.ModelicaLicense2\">here</A></U> 
    17361736or at 
    1737 <A HREF=\"http://www.Modelica.org/modelica-legal-documents/ModelicaLicense2.html\"> 
    1738 http://www.Modelica.org/modelica-legal-documents/ModelicaLicense2.html</A>. 
     1737<A HREF=\"http://www.modelica.org/licenses/ModelicaLicense2\"> 
     1738http://www.modelica.org/licenses/ModelicaLicense2</A>. 
    17391739</td></tr></table> 
    1740   
     1740 
    17411741<P STYLE=\"text-indent: 0pt; font-weight: medium\">Include 
    17421742a copy of the Modelica License 2 under 
    17431743<B>&lt;library&gt;.UsersGuide.ModelicaLicense2</B>  
    1744 (use <A HREF=\"http://www.modelica.org/modelica-legal-documents/ModelicaLicense2.mo\"> 
    1745 http://www.modelica.org/modelica-legal-documents/ModelicaLicense2.mo</A>). Furthermore, add 
     1744(use <A HREF=\"http://www.modelica.org/licenses/ModelicaLicense2.mo\"> 
     1745http://www.modelica.org/licenses/ModelicaLicense2.mo</A>). Furthermore, add 
    17461746the list of authors and contributors under 
    17471747<B>&lt;library&gt;.UsersGuide.Contributors</B> or  
    17481748<B>&lt;library&gt;.UsersGuide.Contact</B>.</P> 
    1749   
     1749 
    17501750<P STYLE=\"text-indent: 0pt; font-weight: medium\">For 
    17511751example, sublibrary Modelica.Blocks of the Modelica Standard Library 
    17521752may have the following notices:</P> 
    1753   
     1753 
    17541754<table border=\"0\"><tr><td>&nbsp;&nbsp;&nbsp;</td><td> 
    17551755Licensed by Modelica Association under the Modelica License 2<br> 
    17561756Copyright &copy; 1998-2008, Modelica Association.  
    17571757</td></tr></table> 
    1758   
     1758 
    17591759<table border=\"0\"><tr><td>&nbsp;&nbsp;&nbsp;</td><td> 
    17601760<I>This Modelica package is <U>free</U> software and 
     
    17651765<A HREF=\"modelica://Modelica.UsersGuide.ModelicaLicense2\">here</A></U> 
    17661766or at 
    1767 <A HREF=\"http://www.Modelica.org/modelica-legal-documents/ModelicaLicense2.html\"> 
    1768 http://www.Modelica.org/modelica-legal-documents/ModelicaLicense2.html</A>.</I> 
     1767<A HREF=\"http://www.modelica.org/licenses/ModelicaLicense2\"> 
     1768http://www.modelica.org/licenses/ModelicaLicense2</A>.</I> 
    17691769</td></tr></table> 
    1770   
    1771   
     1770 
     1771 
    17721772<P STYLE=\"text-indent: 0pt; font-weight: medium\">For 
    17731773C-source code and documents, add similar notices in the corresponding 
    17741774file.</P> 
    1775   
     1775 
    17761776<P STYLE=\"text-indent: 0pt; font-weight: medium\">For 
    17771777images, add a &ldquo;readme.txt&rdquo; file to the directories where 
    17781778the images are stored and include a similar notice in this file.</P> 
    1779   
    1780   
     1779 
     1780 
    17811781<P STYLE=\"text-indent: 0pt; font-weight: medium\">In 
    17821782these cases, save a copy of the Modelica License 2 in one directory 
    17831783of the distribution, e.g.,  
    1784 <A HREF=\"http://www.modelica.org/modelica-legal-documents/ModelicaLicense2-standalone.html\"> 
    1785 http://www.modelica.org/modelica-legal-documents/ModelicaLicense2-standalone.html</A> 
     1784<A HREF=\"http://www.modelica.org/licenses/ModelicaLicense2.html\"> 
     1785http://www.modelica.org/licenses/ModelicaLicense2.html</A> 
    17861786in directory <B>&lt;library&gt;/help/documentation/ModelicaLicense2.html</B>.</P> 
    1787   
    1788   
     1787 
     1788 
    17891789<hr> 
    17901790<H4><A NAME=\"_Ref202857474\"></A><A NAME=\"3. Frequently Asked Questions|outline\"></A> 
     
    17961796the Modelica License 2. In case of a conflict, the language of the 
    17971797license shall prevail.</P> 
    1798   
     1798 
    17991799<P STYLE=\"text-indent: 0pt; font-weight: medium\"><BR> 
    18001800</P> 
    1801   
     1801 
    18021802<P STYLE=\"text-indent: 0pt; font-weight: medium; color: green; font-size:140%\"> 
    18031803<b>Using or Distributing a Modelica <U>Package</U> under the Modelica License 2</b></P> 
    1804   
     1804 
    18051805<P STYLE=\"text-indent: 0pt\"><B>What are the main 
    18061806differences to the previous version of the Modelica License?</B></P> 
    18071807<OL> 
    1808         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium\"> 
    1809         Modelica License 1 is unclear whether the licensed Modelica package 
    1810         can be distributed under a different license. Version 2 explicitly 
    1811         allows that &ldquo;Derivative Work&rdquo; can be distributed under 
    1812         any license of Your choice, see examples in Section 1d) as to what 
    1813         qualifies as Derivative Work (so, version 2 is clearer).</P> 
    1814         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium\"> 
    1815         If You modify a Modelica package under Modelica License 2 (besides 
    1816         fixing of errors, adding vendor specific Modelica annotations, using 
    1817         a subset of the classes of a Modelica package, or using another 
    1818         representation, e.g., a binary representation), you must rename the 
    1819         root-level name of the package for your distribution. In version 1 
    1820         you could keep the name (so, version 2 is more restrictive). The 
    1821         reason of this restriction is to reduce the risk that Modelica 
    1822         packages are available that have identical names, but different 
    1823         functionality.</P> 
    1824         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium\"> 
    1825         Modelica License 1 states that &ldquo;It is not allowed to charge a 
    1826         fee for the original version or a modified version of the software, 
    1827         besides a reasonable fee for distribution and support<SPAN LANG=\"en-GB\">&ldquo;. 
    1828         Version 2 has a </SPAN>similar intention for all Original Work under 
    1829         <U>Modelica License 2</U> (to remain free of charge and open source) 
    1830         but states this more clearly as &ldquo;No fee, neither as a 
    1831         copyright-license fee, nor as a selling fee for the copy as such may 
    1832         be charged&rdquo;. Contrary to version 1, Modelica License 2 has no 
    1833         restrictions on fees for Derivative Work that is provided under a 
    1834         different license (so, version 2 is clearer and has fewer 
    1835         restrictions).</P> 
    1836         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium\"> 
    1837         Modelica License 2 introduces several useful provisions for the 
    1838         licensee (articles 5, 6, 12), and for the licensor (articles 7, 12, 
    1839         13, 14) that have no counter part in version 1.</P> 
    1840         <LI><P STYLE=\"text-indent: 0pt; font-weight: medium\"> 
    1841         Modelica License 2 can be applied to all type of work, including 
    1842         documents, images and data files, contrary to version 1 that was 
    1843         dedicated for software only (so, version 2 is more general).</P> 
     1808        <LI><P STYLE=\"text-indent: 0pt; font-weight: medium\"> 
     1809        Modelica License 1 is unclear whether the licensed Modelica package 
     1810        can be distributed under a different license. Version 2 explicitly 
     1811        allows that &ldquo;Derivative Work&rdquo; can be distributed under