[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses license-recommendations.zh-cn.html...
From: |
GNUN |
Subject: |
www/licenses license-recommendations.zh-cn.html... |
Date: |
Sun, 11 Nov 2018 08:28:27 -0500 (EST) |
CVSROOT: /web/www
Module name: www
Changes by: GNUN <gnun> 18/11/11 08:28:26
Modified files:
licenses : license-recommendations.zh-cn.html
licenses/po : fdl-1.3-faq.translist fdl-1.3-faq.zh-cn.po
Added files:
licenses : fdl-1.3-faq.zh-cn.html
licenses/po : fdl-1.3-faq.zh-cn-en.html
Log message:
Automatic update by GNUnited Nations.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-recommendations.zh-cn.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/fdl-1.3-faq.zh-cn.html?cvsroot=www&rev=1.1
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/fdl-1.3-faq.translist?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/fdl-1.3-faq.zh-cn.po?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/po/fdl-1.3-faq.zh-cn-en.html?cvsroot=www&rev=1.1
Patches:
Index: license-recommendations.zh-cn.html
===================================================================
RCS file: /web/www/www/licenses/license-recommendations.zh-cn.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- license-recommendations.zh-cn.html 11 Nov 2018 11:59:10 -0000 1.1
+++ license-recommendations.zh-cn.html 11 Nov 2018 13:28:26 -0000 1.2
@@ -106,12 +106,11 @@
许å¯è¯ï¼ææ©ä¸ºè½¯ä»¶ææ¡£èç¼åï¼å¹¶å
å«ç¹å«è¯´æï¼å³å½è¿äºä½å被ååæä¿®æ¹æ¶ç常è§é®é¢ã</p>
<p>对äºççã次è¦çæ档工ä½ï¼ä¾å¦åèå¡çï¼æå¥½ä½¿ç¨ <a
-href="/licenses/license-list.html#GNUAllPermissive">GNU all-permissive
-许å¯è¯</a>ï¼å 为ä¸ä»½ GFDL çå¤æ¬é¾ä»¥æ¾è¿ä¸å¼
åèå¡çéé¢ãä¸è¦ç¨CC-BYï¼å 为å®å GFDL ä¸å
¼å®¹ã</p>
+href="/licenses/license-list.html#GNUAllPermissive">GNUå
¨é¢å®¹è®¸æ§è®¸å¯è¯</a>ï¼å 为ä¸ä»½
+GFDL çå¤æ¬é¾ä»¥æ¾è¿ä¸å¼ åèå¡çéé¢ãä¸è¦ç¨CC-BYï¼å
为å®å GFDL ä¸å
¼å®¹ã</p>
<p>å¯¹äº man æå页é¢ï¼å¦æ页é¢å¾é¿ï¼æ们æ¨è
GFDLï¼èå¦æå®å¾çï¼åæ¨è <a
-href="/licenses/license-list.html#GNUAllPermissive">GNU all-permissive
-许å¯è¯</a>ã</p>
+href="/licenses/license-list.html#GNUAllPermissive">GNUå
¨é¢å®¹è®¸æ§è®¸å¯è¯</a>ã</p>
<p>ä¸äºææ¡£å
æ¬äºè½¯ä»¶æºä»£ç
ãä¾å¦ï¼ä¸ä¸ªç¼ç¨è¯è¨ççæåå¯è½å
æ¬è®©ç¨æ·éµå¾ªçä¾åãä½ åºå½æ¢å¨ FDL
ä¹ä¸å¨æåä¸å
å«å®ä»¬ï¼åå¨å¦ä¸ä¸ªéå软件ç许å¯è¯ä¸åå¸å®ä»¬ãè¿æ
·å使å¾å¨å
¶ä»é¡¹ç®ä¸ç¨è¿äºä»£ç åå¾ç®åãæ们æ¨èä½ ç¨ <a
@@ -201,7 +200,7 @@
<p class="unprintable"><!-- timestamp start -->
æåæ´æ°ï¼
-$Date: 2018/11/11 11:59:10 $
+$Date: 2018/11/11 13:28:26 $
<!-- timestamp end -->
</p>
Index: po/fdl-1.3-faq.translist
===================================================================
RCS file: /web/www/www/licenses/po/fdl-1.3-faq.translist,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- po/fdl-1.3-faq.translist 24 Sep 2018 12:58:28 -0000 1.15
+++ po/fdl-1.3-faq.translist 11 Nov 2018 13:28:26 -0000 1.16
@@ -11,6 +11,7 @@
<span dir="ltr"><a lang="pt-br" hreflang="pt-br"
href="/licenses/fdl-1.3-faq.pt-br.html">português do Brasil</a> [pt-br]</span>
<span dir="ltr"><a lang="ru" hreflang="ru"
href="/licenses/fdl-1.3-faq.ru.html">ÑÑÑÑкий</a> [ru]</span>
<span dir="ltr"><a lang="uk" hreflang="uk"
href="/licenses/fdl-1.3-faq.uk.html">ÑкÑаÑнÑÑка</a> [uk]</span>
+<span dir="ltr"><a lang="zh-cn" hreflang="zh-cn"
href="/licenses/fdl-1.3-faq.zh-cn.html">ç®ä½ä¸æ</a> [zh-cn]</span>
</p>
</div>' -->
<link rel="alternate" type="text/html" href="/licenses/fdl-1.3-faq.html"
hreflang="x-default" />
@@ -23,4 +24,5 @@
<link rel="alternate" type="text/html" lang="pt-br" hreflang="pt-br"
href="/licenses/fdl-1.3-faq.pt-br.html" title="português do Brasil" />
<link rel="alternate" type="text/html" lang="ru" hreflang="ru"
href="/licenses/fdl-1.3-faq.ru.html" title="ÑÑÑÑкий" />
<link rel="alternate" type="text/html" lang="uk" hreflang="uk"
href="/licenses/fdl-1.3-faq.uk.html" title="ÑкÑаÑнÑÑка" />
+<link rel="alternate" type="text/html" lang="zh-cn" hreflang="zh-cn"
href="/licenses/fdl-1.3-faq.zh-cn.html" title="ç®ä½ä¸æ" />
<!-- end translist file -->
Index: po/fdl-1.3-faq.zh-cn.po
===================================================================
RCS file: /web/www/www/licenses/po/fdl-1.3-faq.zh-cn.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/fdl-1.3-faq.zh-cn.po 11 Nov 2018 12:57:25 -0000 1.1
+++ po/fdl-1.3-faq.zh-cn.po 11 Nov 2018 13:28:26 -0000 1.2
@@ -13,7 +13,7 @@
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
#. type: Content of: <title>
msgid "GFDL v1.3 FAQ - GNU Project - Free Software Foundation"
@@ -183,8 +183,8 @@
"must have been added to a wiki (or some other kind of web site where the "
"general public could review and edit the materials) before November 1, 2008."
msgstr ""
-"å¦æä½åæåä¸æ¯å¨å
Œ
±çwikiå表çï¼é£ä¹å®å¿
é¡»æ¯å¨2008å¹´11æ1æ¥ä¹åæ·»å å°"
-"wikiï¼æå
¶ä»å
¬ä¼å¯ä»¥æ¥é
åä¿®æ¹ææçç½ç«ï¼ä¸çã"
+"å¦æä½åæåä¸æ¯å¨å
Œ
±çwikiå表çï¼é£ä¹å®å¿
é¡»æ¯å¨2008å¹´11æ1æ¥ä¹åæ·»å å°wiki"
+"ï¼æå
¶ä»å
¬ä¼å¯ä»¥æ¥é
åä¿®æ¹ææçç½ç«ï¼ä¸çã"
#. type: Content of: <dl><dd><p>
msgid ""
Index: fdl-1.3-faq.zh-cn.html
===================================================================
RCS file: fdl-1.3-faq.zh-cn.html
diff -N fdl-1.3-faq.zh-cn.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ fdl-1.3-faq.zh-cn.html 11 Nov 2018 13:28:26 -0000 1.1
@@ -0,0 +1,132 @@
+<!--#set var="ENGLISH_PAGE" value="/licenses/fdl-1.3-faq.en.html" -->
+
+<!--#include virtual="/server/header.zh-cn.html" -->
+<!-- Parent-Version: 1.77 -->
+
+<!-- This file is automatically generated by GNUnited Nations! -->
+<title>GFDL v1.3 常è§é®é¢è§£ç - GNUå·¥ç¨ - èªç±è½¯ä»¶åºéä¼</title>
+
+<!--#include virtual="/licenses/po/fdl-1.3-faq.translist" -->
+<!--#include virtual="/server/banner.zh-cn.html" -->
+<h2>GFDL v1.3 常è§é®é¢è§£ç</h2>
+
+<p>èªç±è½¯ä»¶åºéä¼å¨2008å¹´11æ3æ¥åå¸äºGNUèªç±æ档许å¯è¯1.3çãæ¬é®çæ¶åå°äººä»¬å
³äºæ们为ä»ä¹åå¸è¿ä¸ªæ°çæ¬ï¼ä»¥åå®åFDLv2æ¯ä»ä¹å
³ç³»ãæ´å¤ä¿¡æ¯ï¼è¯·è®¿é®<strong><a
+href="/licenses/fdl-1.3.html">FDL 1.3许å¯è¯é¡µé¢</a></strong>ã</p>
+
+<dl>
+<dt>æ们为ä»ä¹ä¼åå¸ä¸ä¸ªæ°çFDLå°çæ¬ï¼</dt>
+
+<dd><p>å»å¹´æäºæ¶åï¼ç管<a
+href="http://www.wikipedia.org/">Wikipedia</a>项ç®çWikimediaåºéä¼éè¿äºä¸é¡¹å³è®®ï¼è¯¥å³è®®è¯·æ±æ们æ´æ°FDL以便Wikipediaåå
¶ä»ä½¿ç¨FDLçWikisä¹å¯ä»¥ä½¿ç¨<a
+href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
+Attribution-ShareAlike (CC-BY-SA) 3.0许å¯è¯</a>ã</p>
+
+<p>å 为æ们è¿æ²¡æåå¤å¥½åå¸FDL
2.0çï¼æ以æ们åå¸äºè¿ä¸ªå°çæ¬ã该çæ¬å°±æ¯ä¸ºäºæ»¡è¶³Wikimediaåºéä¼ç请æ±ã</p></dd>
+
+<dt>FDL 1.3åFDL 2.0ä¸å·²ç»å®æçå·¥ä½æä»ä¹æ ·çå
³ç³»ï¼</dt>
+
+<dd><p>FDL 1.3å
æ¬äºä¸äºFDL 2.0è¦å¼å
¥çåè½ï¼ä½æ¯è¿å°±åªéäºå®ä»¬ä¹é´çå
³ç³»ãFDL 2.0çç®æ
并ä¸å1.3åå¸çå½±åã</p></dd>
+
+<dt>FDL 1.3é½åäºåªäºæ¹åï¼</dt>
+
+<dd><p>主è¦çæ¹åæ¯å¢å äºç¬¬11èãè¿ä¸ªæ°æ¡æ¬¾å
许使ç¨æ¤çæ¬åå¸çèµæä¹å¯ä»¥å¨CC-BY-SA
+3.0许å¯è¯ä¸ä½¿ç¨ãæ´å¤å
³äºç©¶ç«ä»ä¹æ ·çèµæå¯ä»¥ä½¿ç¨è¿æ
·ç许å¯è¯ï¼è¯·åçä¸é¢çç¸å
³é®é¢è§£çãä½ä¸ºè¿ä¸ªæ¹åçä¸é¨åï¼æ们ä¹å¨ç¬¬1èå¼å
¥äºä¸ä¸ªæ°çå®ä¹ã</p>
+
+<p>æ们è¿ä»GPLv3åé´äºä¸äºæ´æ¹ã第ä¸ä¸ªæ¯å¨ç¬¬9èï¼å®è§£éäºå½ä½
è¿å许å¯è¯æ¶ï¼è®¸å¯è¯ä¼æä¹ç»æ¢ãç°å¨ï¼æ们æä¾äºä¸ç§æºå¶ï¼å®å¯ä»¥è®©è¿åè
å¨ä¿®å¤äºè¿åè¡ä¸ºä¹åè½å¤èªå¨æ¢å¤è®¸å¯è¯æå©ã第äºä¸ªæ¯å¨ç¬¬10èï¼ç°å¨ææè
å¯ä»¥éæ©ä¸ä¸ªä»£çï¼è¯¥ä»£çå¯ä»¥å³å®ä¸ä¸ªä½åæ¯å¦è½å¤ä½¿ç¨å°æ¥çFDLææã</p>
+
+<p>ä¸ä¸ªæ¾ç¤ºæ<a href="/licenses/fdl-1.3-pdiff.ps">FDL 1.2å°FDL
+1.3çåæ´é¡¹ç®</a>çPostscriptæ件å¨æ¤ä¾ä½ æ¥çã</p></dd>
+
+<dt>è¿äºæ¹åççç±æ¯ä»ä¹ï¼</dt>
+
+<dd><p>第11èçå¢å æ¯ä¸ºäºå
许诸å¦Wikipediaè¿æ
·çwikiå¯ä»¥å¨CC-BY-SA
+3.0çæ¡æ¬¾ä¸ä½¿ç¨FDLææçä½åï¼å¦æwikiéæ©è¿æ
·åçè¯ãä»ä»¬å·²ç»åè¯æ们ä»ä»¬æ¿æ使ç¨è¯¥é项ï¼æ·»å
è¿ä¸ªæ¡æ¬¾å°±ç»äºä»ä»¬ä¸ä¸ªæ¸
æ°çæä½æ¹æ³ã</p>
+
+<p>ä¸è¬æ
åµä¸ï¼è¿æ ·ç许å¯è¯å³å®è½å¤ä¹åºè¯¥ç±å
·ä½ä½åççæææè
æ¥å¤çãä¸è¿ï¼ç±äºWikipediaæ许å¤çæææè
ï¼æ以å®éè¦å
¶ä»çæ¹æ³æ¥è¾¾ææ¤äºï¼å¹¶ä¸æ们åä»ä»¬ä¸éåäºè¿äºã</p>
+
+<p>å
¶ä»ä¸äºæ¹åé½æ¯å°çæ¹è¿ï¼èä¸å¾å®¹æåãå®ä»¬åGPLv3æ广æ³çä¸è´æ§ï¼å¹¶ä¸å®ä»¬ä¹å®å
¨ä¸æ¹å许å¯è¯çåºæ¬è®¸å¯æè¦æ±ã</p></dd>
+
+<dt>究ç«ä»ä¹æ ·çææå¯ä»¥ä½¿ç¨CC-BY-SA 3.0ææï¼</dt>
+
+<dd><p>è¦ä½¿FDLææçä½å使ç¨CC-BY-SA 3.0æ¡æ¬¾ï¼ä»¥ä¸æ¡ä»¶å¿
须满足ï¼</p>
+
+<ul>
+<li><p>ä½åå¿
é¡»æ¯å·²ç»æç
§FDL
+1.3åå¸çï¼è¿æ ·æä¼ææ¤ç±»è®¸å¯ãå¦æä½åæ¯æç
§“GNUèªç±æ档许å¯è¯ï¼çæ¬1.2æï¼å¦æä½
æ¿æï¼ä»»ä½æ´é«çæ¬åå¸ç”ï¼é£ä¹å®æ»¡è¶³è¯¥æ¡ä»¶ã</p></li>
+<li><p>ä½åä¸è½æä»»ä½ç“å°é¢æå”æ“æå®ç«
è”ãè¿äºæ¯FDLçå¯éåè½ã</p></li>
+<li><p>å¦æä½åæåä¸æ¯å¨å
Œ
±çwikiå表çï¼é£ä¹å®å¿
é¡»æ¯å¨2008å¹´11æ1æ¥ä¹åæ·»å å°wikiï¼æå
¶ä»å
¬ä¼å¯ä»¥æ¥é
åä¿®æ¹ææçç½ç«ï¼ä¸çã</p></li>
+</ul>
+
+<p>ææå¨2008å¹´11æ1æ¥ä¹åæ·»å
å°WikipediaçFDLææé½æ»¡è¶³è¿äºæ¡ä»¶ã</p></dd>
+
+<dt>为ä»ä¹å¨ç¬¬11èä¼æ两个ä¸åçæ¥æï¼ä¸ºä»ä¹ä¼éæ©è¿ä¸¤ä¸ªæ¥æï¼</dt>
+
+<dd><p>第11èç»è®¸å¯è¯æ¥åè
强å
äºä¸¤ä¸ªæªæ¢æ¥æã第ä¸ï¼å¦æä¸ä¸ªä½åæåä¸æ¯å¨å
Œ
±wikiä¸å表çï¼é£ä¹åªæå®æ¯å¨2008å¹´11æ1æ¥ä¹åæ·»å
å°wikiä¸æ¶ä½ æå¯ä»¥ä½¿ç¨CC-BY-SA
+3.0ææãæ们ä¸æ³ç»ä»»ä½ä»¥åæææç
§FDLåå¸çä½åé½åæ¤ææãæ们ä¹ä¸æ³è®©äººä»¬éè¿æFDLèµæå表å°wikiä¸ï¼ç¶ååæç
§CC-BY-SAä¹±ç¨ãéåä¸ä¸ªå·²ç»è¿å»çæªæ¢æ¥æ就毫ä¸å«ç³å°é²æ¢äºè¿ä¸ªé®é¢ã</p>
+
+<p>第äºï¼è¯¥è®¸å¯å¨2009å¹´8æ1æ¥ä¹åå°±ä¸åææãæ们ä¸æ³è®©è¿ä¸ªè®¸å¯æ为ä¸ä¸ªä¸è¬æ§ç许å¯è¯åæ¢è®¸å¯ï¼å¦ææ¯ä¸ªwikié½èªå·±å³å®éåä½ç§è®¸å¯è¯å¹¶ä¿æä¸åï¼é£ä¹ç¤¾åºçç¶åµå°±ä¼å¥½å¾å¤ãè¿ä¸ªæªæ¢æ¥æå¯ä»¥ä¿è¯ä»¥ä¸ç»æï¼åæ¶è¿ç»äºææwikiç»´æ¤è
å
足çåå³å®çæ¶é´ã</p></dd>
+
+<dt>FDL 2.0ç®åç计åæ¯ä»ä¹ï¼</dt>
+
+<dd><p>æ们è¿å¨æ¥å对è¿ä¸ªè®¸å¯è¯ä¸»çæ¬çè¯è®®ãå¨å½åçFDL
2.0èæ¡éï¼ç¬¬8(b)èå
许FDLææå¨wikiéæ°ææãç±äºFDL
+1.3ç®åå·²ç»å¨ç¬¬11èæä¾äºè¯¥é项ï¼å®å¨FDL
+2.0ä¸å°±ä¸åå¿
è¦äºãä¸è¿ï¼èæ¡ä¸çææå
¶ä»çæ´æ¹å»ºè®®å¯¹æ°ç许å¯è¯é½è¿æ¯éå½çï¼æ以å®ä»¬é½è¿å¨è®¨è®ºçèå´ä¹å
ã</p></dd>
+</dl>
+<div class="translators-notes">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
+ </div>
+</div>
+
+<!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.zh-cn.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>请å°æå
³èªç±è½¯ä»¶åºéä¼ï¼FSFï¼&GNUçä¸è¬æ§é®é¢åéå°<a
+href="mailto:address@hidden"><address@hidden></a>ãä¹å¯ä»¥éè¿<a
+href="/contact/">å
¶ä»èç³»æ¹æ³</a>èç³»èªç±è½¯ä»¶åºéä¼(FSF)ã请å°æ æé¾æ¥ï¼å
¶ä»é误æ建议åéç»<a
+href="mailto:address@hidden"><address@hidden></a>ã</p>
+
+<p>
+<!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden">
+
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+è¥æ¨æ³ç¿»è¯æ¬æï¼è¯·åç<a
href="/server/standards/README.translations.html">ç¿»è¯é¡»ç¥</a>ã</p>
+</div>
+
+<p>Copyright © 2014 Free Software Foundation, Inc.</p>
+
+<p>æ¬é¡µé¢ä½¿ç¨<a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative Commons
+Attribution-NoDerivs 3.0 United States License</a>ææã</p>
+
+<!--#include virtual="/server/bottom-notes.zh-cn.html" -->
+<div class="translators-credits">
+
+<!--TRANSLATORS: Use space (SPC) as msgstr if you don't want credits.-->
+<b>ç¿»è¯å¢é</b>ï¼<a rel="team"
+href="https://savannah.gnu.org/projects/www-zh-cn/"><CTT></a>ï¼2018ã</div>
+
+<p class="unprintable"><!-- timestamp start -->
+æåæ´æ°ï¼
+
+$Date: 2018/11/11 13:28:26 $
+
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
Index: po/fdl-1.3-faq.zh-cn-en.html
===================================================================
RCS file: po/fdl-1.3-faq.zh-cn-en.html
diff -N po/fdl-1.3-faq.zh-cn-en.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ po/fdl-1.3-faq.zh-cn-en.html 11 Nov 2018 13:28:26 -0000 1.1
@@ -0,0 +1,173 @@
+<!--#include virtual="/server/header.html" -->
+<!-- Parent-Version: 1.77 -->
+<title>GFDL v1.3 FAQ
+- GNU Project - Free Software Foundation</title>
+<!--#include virtual="/licenses/po/fdl-1.3-faq.translist" -->
+<!--#include virtual="/server/banner.html" -->
+<h2>GFDL v1.3 FAQ</h2>
+
+<p>The Free Software Foundation released version 1.3 of the GNU Free
+ Documentation License on November 3, 2008. This
+ FAQ addresses questions that people may have about why we have
+ released this new version of the license, and how it relates to
+ FDLv2. More resources are available
+ from <strong><a href="/licenses/fdl-1.3.html">the license page for
+ FDL 1.3</a></strong>.</p>
+
+<dl>
+<dt>Why did you release a new minor version of the FDL?</dt>
+
+<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
+the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative
+Commons Attribution-ShareAlike (CC-BY-SA) 3.0 license</a>.</p>
+
+<p>Because we are not ready to release FDL 2.0, we have made this
+release in the meantime. This new version of the license is meant to
+fulfill the Wikimedia Foundation's request.</p></dd>
+
+<dt>How is FDL 1.3 related to the work that's been done so far on FDL 2.0?</dt>
+
+<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>What are the changes in FDL 1.3?</dt>
+
+<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
+questions below. As part of this change, we also introduced a new
+definition in section 1.</p>
+
+<p>We also borrowed a couple of changes from GPLv3. The first is in
+section 9, which explains how the license can be terminated when you
+violate it. We now provide a means for violators to automatically
+have their rights restored if they cure the violation. The second is
+in section 10: now licensors can choose a proxy who is allowed to
+decide whether or not a work can be licensed under the terms of future
+versions of the FDL.</p>
+
+<p>A Postscript file
+ 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>What is the rationale behind these changes?</dt>
+
+<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>
+
+<p>Normally, these sorts of licensing decisions can and should be handled
+by the copyright holder(s) of a particular work. However, because
+Wikipedia has many copyright holders, the project needed some
+alternative way to accomplish this, and we've worked with them to
+provide that.</p>
+
+<p>The other changes are minor improvements that were easy to make while
+we were at it. They've met with wide approval in GPLv3, and they
+don't change the license's fundamental permissions or requirements at
+all.</p></dd>
+
+<dt>Exactly what material can be licensed under CC-BY-SA 3.0?</dt>
+
+<dd><p>In order to license an FDL-covered work under CC-BY-SA 3.0, a few
+conditions must be met:</p>
+
+<ul>
+<li><p>The work must be available under the terms of FDL 1.3, which
+provides you with this permission. If the work was released under the
+terms of “the GNU Free Documentation License, version 1.2 or (at
+your option) any later version,” then it meets this
+criteria.</p></li>
+<li><p>The work must not have any “Cover Texts” or
+“Invariant Sections.” These are optional features in all
+versions of the FDL.</p></li>
+<li><p>If the work was originally published somewhere other than a
+public wiki, it must have been added to a wiki (or some other kind of
+web site where the general public could review and edit the materials)
+before November 1, 2008.</p></li>
+</ul>
+
+<p>All FDL-covered material added to Wikipedia before November 1, 2008
+satisfies these conditions.</p></dd>
+
+<dt>What is the purpose of the two different dates in section 11? Why
+did you choose those specific dates?</dt>
+
+<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
+any and all works released under the FDL. We also do not want people
+gaming the system by adding FDLed materials to a wiki, and then using
+them under CC-BY-SA afterwards. Choosing a deadline that has already
+passed unambiguously prevents this.</p>
+
+<p>Second, this permission is no longer available after August 1, 2009.
+We don't want this to become a general permission to switch between
+licenses: the community will be much better off if each wiki makes its
+own decision about which license it would rather use, and sticks with
+that. This deadline ensures that outcome, while still offering all
+wiki maintainers ample time to make their decision.</p></dd>
+
+<dt>What are your current plans for FDL 2.0?</dt>
+
+<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
+other changes proposed in the draft would still be appropriate for the
+next version of the license, so they're still on the table for
+discussion.</p></dd>
+</dl>
+</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/footer.html" -->
+<div id="footer">
+<div class="unprintable">
+
+<p>Please send general FSF & GNU inquiries to <a
+href="mailto:address@hidden"><address@hidden></a>. There are also <a
+href="/contact/">other ways to contact</a> the FSF. Broken links and other
+corrections or suggestions can be sent to <a
+href="mailto:address@hidden"><address@hidden></a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden">
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+Please see the <a
+href="/server/standards/README.translations.html">Translations README</a> for
+information on coordinating and submitting translations of this article.</p>
+</div>
+
+<p>Copyright © 2014 Free Software Foundation, Inc.</p>
+
+<p>This page is licensed under a <a rel="license"
+href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
+
+<!--#include virtual="/server/bottom-notes.html" -->
+
+<p class="unprintable">Updated:
+<!-- timestamp start -->
+$Date: 2018/11/11 13:28:26 $
+<!-- timestamp end -->
+</p>
+</div>
+</div>
+</body>
+</html>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/licenses license-recommendations.zh-cn.html...,
GNUN <=