CVSROOT: /web/www Module name: www Changes by: Brett Smith <brett> 11/01/04 17:51:41
Modified files: licenses : gpl-faq.html Log message: remove <a name> tags from footnotes CVSWeb URLs: http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.html?cvsroot=www&r1=1.155&r2=1.156 Patches: Index: gpl-faq.html =================================================================== RCS file: /web/www/www/licenses/gpl-faq.html,v retrieving revision 1.155 retrieving revision 1.156 diff -u -b -r1.155 -r1.156 --- gpl-faq.html 4 Jan 2011 17:48:29 -0000 1.155 +++ gpl-faq.html 4 Jan 2011 17:51:28 -0000 1.156 @@ -3319,42 +3319,44 @@ <p><a href="#matrix-skip-target">Skip footnotes</a></p> -<p><a name="compat-matrix-footnote-1">1</a>: You must follow the terms of -GPLv2 when incorporating the code in this case. You cannot take advantage -of terms in later versions of the GPL.</p> - -<p><a name="compat-matrix-footnote-2">2</a>: If you do this, as long as the -project contains the code released under GPLv2 only, you will not be able -to upgrade the project's license to GPLv3 or later.</p> +<p id="compat-matrix-footnote-1">1: You must follow the terms of GPLv2 +when incorporating the code in this case. You cannot take advantage of +terms in later versions of the GPL.</p> + +<p id="compat-matrix-footnote-2">2: If you do this, as long as the +project contains the code released under GPLv2 only, you will not be +able to upgrade the project's license to GPLv3 or later.</p> -<p><a name="compat-matrix-footnote-3">3</a>: If you have the ability to -release the project under GPLv2 or any later version, you can choose to +<p id="compat-matrix-footnote-3">3: If you have the ability to release +the project under GPLv2 or any later version, you can choose to release it under GPLv3 or any later version—and once you do that, you'll be able to incorporate the code released under GPLv3.</p> -<p><a name="compat-matrix-footnote-4">4</a>: If you have the ability to -release the project under LGPLv2.1 or any later version, you can choose to -release it under LGPLv3 or any later version—and once you -do that, you'll be able to incorporate the code released under LGPLv3.</p> +<p id="compat-matrix-footnote-4">4: If you have the ability to release +the project under LGPLv2.1 or any later version, you can choose to +release it under LGPLv3 or any later version—and once you do +that, you'll be able to incorporate the code released under +LGPLv3.</p> -<p><a name="compat-matrix-footnote-5">5</a>: You must follow the terms of +<p id="compat-matrix-footnote-5">5: You must follow the terms of LGPLv2.1 when incorporating the code in this case. You cannot take advantage of terms in later versions of the LGPL.</p> -<p><a name="compat-matrix-footnote-6">6</a>: If you do this, as long as the -project contains the code released under LGPLv2.1 only, you will not be -able to upgrade the project's license to LGPLv3 or later.</p> - -<p><a name="compat-matrix-footnote-7">7</a>: LGPLv2.1 gives you permission -to relicense the code under any version of the GPL since GPLv2. If you can -switch the LGPLed code in this case to using an appropriate version of the -GPL instead (as noted in the table), you can make this combination.</p> - -<p><a name="compat-matrix-footnote-8">8</a>: LGPLv3 gives you permission to -relicense the code under GPLv3. In these cases, you can combine the code -if you convert the LGPLed code to GPLv3.</p> +<p id="compat-matrix-footnote-6">6: If you do this, as long as the +project contains the code released under LGPLv2.1 only, you will not +be able to upgrade the project's license to LGPLv3 or later.</p> + +<p id="compat-matrix-footnote-7">7: LGPLv2.1 gives you permission to +relicense the code under any version of the GPL since GPLv2. If you +can switch the LGPLed code in this case to using an appropriate +version of the GPL instead (as noted in the table), you can make this +combination.</p> + +<p id="compat-matrix-footnote-8">8: LGPLv3 gives you permission to +relicense the code under GPLv3. In these cases, you can combine the +code if you convert the LGPLed code to GPLv3.</p> -<a name="matrix-skip-target"></a> +<div id="matrix-skip-target"></div> </dd> @@ -3392,7 +3394,7 @@ <p> Updated: <!-- timestamp start --> -$Date: 2011/01/04 17:48:29 $ +$Date: 2011/01/04 17:51:28 $ <!-- timestamp end --> </p> </div>