CVSROOT: /web/www Module name: www Changes by: Waclaw Jacek <wwj> 11/02/10 00:10:37
Modified files: licenses : fdl-1.3-faq.html Log message: Removing the Q. and A. characters from the beginning of questions and answers on licenses/fdl-1.3-faq.html, as suggested in RT #639358 CVSWeb URLs: http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/fdl-1.3-faq.html?cvsroot=www&r1=1.7&r2=1.8 Patches: Index: fdl-1.3-faq.html =================================================================== RCS file: /web/www/www/licenses/fdl-1.3-faq.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- fdl-1.3-faq.html 9 Oct 2010 00:47:05 -0000 1.7 +++ fdl-1.3-faq.html 10 Feb 2011 00:10:33 -0000 1.8 @@ -15,9 +15,9 @@ FDL 1.3</a></strong>.</p> <dl> -<dt>Q. Why did you release a new minor version of the FDL?</dt> +<dt>Why did you release a new minor version of the FDL?</dt> -<dd><p>A. Late last year, the Wikimedia Foundation, which oversees the +<dd><p>Late last year, the Wikimedia Foundation, which oversees the <a href="http://www.wikipedia.org/">Wikipedia</a> project, passed a resolution asking us to update the FDL so as to allow Wikipedia and similar Wikis using the FDL to also use @@ -28,15 +28,15 @@ release in the meantime. This new version of the license is meant to fulfill the Wikimedia Foundation's request.</p></dd> -<dt>Q. How is FDL 1.3 related to the work that's been done so far on FDL 2.0?</dt> +<dt>How is FDL 1.3 related to the work that's been done so far on FDL 2.0?</dt> -<dd><p>A. FDL 1.3 incorporates a couple of features that have been proposed +<dd><p>FDL 1.3 incorporates a couple of features that have been proposed for FDL 2.0, but that's the extent of their relationship. Our goals for FDL 2.0 are not affected by this release.</p></dd> -<dt>Q. What are the changes in FDL 1.3?</dt> +<dt>What are the changes in FDL 1.3?</dt> -<dd><p>A. The primary change is the addition of section 11. This new +<dd><p>The primary change is the addition of section 11. This new provision allows certain materials released under this license to also be used under the terms of CC-BY-SA 3.0. For more information about exactly what materials can be licensed this way, see the related @@ -55,9 +55,9 @@ showing <a href="/licenses/fdl-1.3-pdiff.ps">marked-up changes from FDL 1.2 to FDL 1.3</a> is available for your review.</p></dd> -<dt>Q. What is the rationale behind these changes?</dt> +<dt>What is the rationale behind these changes?</dt> -<dd><p>A. Section 11 has been added to allow wikis like Wikipedia to use +<dd><p>Section 11 has been added to allow wikis like Wikipedia to use FDL-covered works under the terms of CC-BY-SA 3.0 if they choose to do so. They have told us that they would like to explore this option, and adding this provision gives them a clear path to do so.</p> @@ -73,9 +73,9 @@ don't change the license's fundamental permissions or requirements at all.</p></dd> -<dt>Q. Exactly what material can be licensed under CC-BY-SA 3.0?</dt> +<dt>Exactly what material can be licensed under CC-BY-SA 3.0?</dt> -<dd><p>A. In order to license an FDL-covered work under CC-BY-SA 3.0, a few +<dd><p>In order to license an FDL-covered work under CC-BY-SA 3.0, a few conditions must be met:</p> <ul> @@ -96,10 +96,10 @@ <p>All FDL-covered material added to Wikipedia before November 1, 2008 satisfies these conditions.</p></dd> -<dt>Q. What is the purpose of the two different dates in section 11? Why +<dt>What is the purpose of the two different dates in section 11? Why did you choose those specific dates?</dt> -<dd><p>A. Section 11 imposes two deadlines on licensees. First, if a +<dd><p>Section 11 imposes two deadlines on licensees. First, if a work was originally published somewhere other than a public wiki, you can only use it under CC-BY-SA 3.0 if it was added to a wiki before November 1, 2008. We do not want to grant people this permission for @@ -115,9 +115,9 @@ that. This deadline ensures that outcome, while still offering all wiki maintainers ample time to make their decision.</p></dd> -<dt>Q. What are your current plans for FDL 2.0?</dt> +<dt>What are your current plans for FDL 2.0?</dt> -<dd><p>A. We are still accepting comments on this major new revision of the +<dd><p>We are still accepting comments on this major new revision of the license. In the current FDL 2.0 draft, section 8(b) allows for relicensing of materials in a wiki. Since FDL 1.3 now provides this in section 11, it's no longer necessary in FDL 2.0. However, all the @@ -160,7 +160,7 @@ <p> Updated: <!-- timestamp start --> -$Date: 2010/10/09 00:47:05 $ +$Date: 2011/02/10 00:10:33 $ <!-- timestamp end --> </p> </div>