www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/philosophy free-sw.zh-cn.html po/free-sw.zh...


From: GNUN
Subject: www/philosophy free-sw.zh-cn.html po/free-sw.zh...
Date: Wed, 1 Sep 2021 05:34:30 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/09/01 05:34:30

Modified files:
        philosophy     : free-sw.zh-cn.html 
        philosophy/po  : free-sw.zh-cn-en.html free-sw.zh-cn.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-sw.zh-cn.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn-en.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/po/free-sw.zh-cn.po?cvsroot=www&r1=1.55&r2=1.56

Patches:
Index: free-sw.zh-cn.html
===================================================================
RCS file: /web/www/www/philosophy/free-sw.zh-cn.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- free-sw.zh-cn.html  19 Aug 2021 08:13:18 -0000      1.22
+++ free-sw.zh-cn.html  1 Sep 2021 09:34:29 -0000       1.23
@@ -12,10 +12,7 @@
 .toc >
  ul > li { list-style-type: none; font-weight: bold; }
 .toc ul { font-weight: normal; }
-.note { margin-left: 6%; margin-right: 6%; }
-@media (min-width: 48em) {
-   .note { margin-top: .8em; }
-}
+#History ~ p, #History ~ ul { font-size: 1rem; }
 -->
 </style>
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
自由软件基金会, Linux, Emacs, GCC, Unix, Free
@@ -27,11 +24,10 @@
 <!--#include virtual="/philosophy/ph-breadcrumb.zh-cn.html" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#include virtual="/server/top-addendum.zh-cn.html" -->
-<div class="reduced-width">
+<div class="article reduced-width">
 <h2>什么是自由软件?</h2>
 <div class="thin"></div>
 
-<div class="article">
 <div class="important">
 <p>
 
&ldquo;自由软件&rdquo;尊重用户的自由,并且尊重整个社区。粗略来讲,一个软件如果是自由软件,这意味着<b>用户可以自由地运行,拷贝,分发,学ä¹
 ï¼Œä¿®æ”¹å¹¶æ”¹è¿›è¯¥è½¯ä»¶</b>。因此,&ldquo;自由软件&rdquo;是å…
³ä¹Žè‡ªç”±çš„问题,与价格无å…
³ï¼Œè½¯ä»¶å¦‚何定价并不影响它是否被归类为自由软件。英文中,我们使用Free
@@ -90,7 +86,7 @@
 </ul>
 </div>
 
-<div class="edu-note" id="fsf-licensing">
+<div class="edu-note" id="fsf-licensing" role="complementary">
 <p style="font-size:80%">
 还有关于自由软件授权的其他问题?请参看其他 <a
 href="http://www.fsf.org/licensing";>授权资源</a>,如果必
要,请通过<a
@@ -99,7 +95,7 @@
 </div>
 
 
-<h3 id="fs-definition" class="subheader">自由软件定义</h3>
+<h3 id="fs-definition">自由软件定义</h3>
 
 <p>
 
此处给出自由软件的定义,用以衡量一款软件是否为自由软件。一直以来,我们不断改进这个定义,以此澄æ¸
…并解决我们遇到的各种问题。参考下方的<a
@@ -150,7 +146,7 @@
 </p>
 
 
-<h3 id="clarifying" class="subheader">澄清自由和非自由的边界</h3>
+<h3 id="clarifying">澄清自由和非自由的边界</h3>
 
 
<p>在本文的以下部分,我们会进一步准确地解释这些自由针对各种问题会如何扩展才能使软件自由。</p>
 
@@ -274,7 +270,7 @@
 很遗憾,我们无法列出所有可能的意外情
况。如果一份基于合同的许可证对用户做出了一些额外限制,并且这些限制是不可能åŒ
…
含在一份基于版权的许可证中的,那么我们就需要再三考虑它是否可以被视作自由许可证。很多æƒ
…况下,这些许可证都是非自由的。
 </p>
 
-<h3 id="in-practice" class="subheader">自由软件定义的实际操作</h3>
+<h3 id="in-practice">自由软件定义的实际操作</h3>
 
 <h4 id="interpretation">我们如何诠释这些标准</h4>
 
@@ -312,7 +308,7 @@
 &ldquo;开放&rdquo; 却从来不意味着自由。
 </p>
 
-<h3 id="beyond-software" class="subheader">软件之外</h3>
+<h3 id="beyond-software">软件之外</h3>
 
 <p>
 基于同样的原则,<a
@@ -328,8 +324,6 @@
 
任何作品都<em>可以</em>是自由的,自由软件的定义也可以延伸到å
…¶ä»–作品上。关于这方面的材料,请参见<a
 href="http://freedomdefined.org/";>自由文化作品</a>。
 </p>
-<hr class="column-limit" />
-</div>
 
 <h3 id="History">本文修改历史</h3>
 
@@ -338,76 +332,76 @@
 <ul>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.168&amp;r2=1.169";>版本
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.168&amp;r2=1.169">版本
 1.169</a>:更清楚地解释为什么四个自由必
须对商业活动也适用。解释为什么四个自由隐含有不运行程序的自由和åˆ
 é™¤ç¨‹åºçš„自由,因此没有必要再单独陈述这些自由。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.164&amp;r2=1.165";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.164&amp;r2=1.165">Version
 1.165</a>:澄清程序中的随意代ç 
å¹¶æ²¡æœ‰å¦è®¤ç”¨æˆ·çš„自由之零,进而自由之一和自由之三使用户可以å
…‹æœè¿™äº›éšæ„ä»£ç ã€‚</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.152&amp;r2=1.153";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.152&amp;r2=1.153">Version
 1.153</a>:强调运行软件的自由是不能有任何情
况来防止用户运行软件。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.140&amp;r2=1.141";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.140&amp;r2=1.141">Version
 1.141</a>:澄清了哪部分的代码需要是自由的。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.134&amp;r2=1.135";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.134&amp;r2=1.135">Version
 
1.135</a>:强调自由度0是用户可以出于任何目的而运行软件。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.133&amp;r2=1.134";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.133&amp;r2=1.134">Version
 1.134</a>:声明自由度0与软件功能无关。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.130&amp;r2=1.131";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.130&amp;r2=1.131">Version
 1.131</a>:自由的许可证不得要求用户必
须遵守另外一个程序的非自由许可证。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.128&amp;r2=1.129";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.128&amp;r2=1.129">Version
 1.129</a>:明确重申法律纠纷的起诉地可以由自由软件所有者
指定。(这一直都是我们的原则。)</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122">Version
 1.122</a>:出口限制要求在一些特殊情
况下可能会生出麻烦。但是大部分的时候它只是个潜在问题。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.117&amp;r2=1.118";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.117&amp;r2=1.118">Version
 1.118</a>:澄清修改不等于改进。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.110&amp;r2=1.111";>Version
-1.111</a>:阐明自由软件许可证不得允许版权所有者
在软件发布之后对用户增加更多<em>限制</em>。版权所有者完å…
¨å¯ä»¥åœ¨äº‹åŽç»™ç”¨æˆ·æ›´å¤šæƒåˆ©ã€‚</li>
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.110&amp;r2=1.111">Version
+1.111</a>:阐明自由软件许可证不得允许版权所有者
在软件发布之后对用户增加更多<em>限制</em>。版权所有者完å…
¨å¯ä»¥å¹¶è¡Œç”¨å…¶ä»–发布方式给用户更多<em>许可</em>。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.104&amp;r2=1.105";>Version
-1.105</a>:在对自由度1的描述中,强调用户使用自己修改后的版本进行计算。</li>
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.104&amp;r2=1.105">Version
+1.105</a>:在对自由度1的描述中(如版本 1.80 
所述),强调用户使用自己修改后的版本进行计算。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.91&amp;r2=1.92";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.91&amp;r2=1.92">Version
 1.92</a>:阐明混淆(obfuscated)后的代码不被视作源代ç 
ã€‚</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.89&amp;r2=1.90";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.89&amp;r2=1.90">Version
 
1.90</a>:阐明自由度3是指用户有权利去发布自己的修改版本,而不是有权利参与别人的开发。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.88&amp;r2=1.89";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.88&amp;r2=1.89">Version
 1.89</a>:自由度3包
括了用户有权利以自由软件的形式发布修改后的版本。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.79&amp;r2=1.80";>Version
-1.80</a>:自由度1必须是可以实施的,而不仅仅
停留在理论上。因此如果出售的硬件包
括了自由软件,那么该硬件必
须提供一种方法让用户可以运行自己修改后的软件。否则该硬件所携带的软件将不被视作自由软件。</li>
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.79&amp;r2=1.80">Version
+1.80</a>:自由度1必须是可以实施的,而不仅仅
停留在理论上,比如,不能是 tivoization。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.76&amp;r2=1.77";>Version
-1.77</a>:声明已经发布给用户的软件,å…
¶è®¸å¯è¯å°†ä¸å¾—修改。</li>
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.76&amp;r2=1.77">Version
+1.77</a>:声明已经发布给用户的软件,å…
¶è®¸å¯è¯å°†ä¸å¾—修改,即使只是部分修改。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.73&amp;r2=1.74";>Version
-1.74</a>:此次修改重点强调四个要点:
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.73&amp;r2=1.74">Version
+1.74</a>:此次修改重点强调四个要点,它们或者不够清
楚,或者只体现在某些地方而不是全局:
 <ul>
 
<li>"改进"并不意味着许可证可以限制用户只能做哪些方面的修改。自由度3å
…è®¸ç”¨æˆ·å†å‘布修改后的完整软件,而非仅仅
是修改的部分。</li>
 <li>用户有权利在自由软件中使用第三方的代ç 
ï¼Œä½†æ˜¯å‰ææ˜¯ç¬¬ä¸‰æ–¹ä»£ç çš„许可证与该自由软件的许可证å…
¼å®¹ã€‚</li>
@@ -417,46 +411,46 @@
 </li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.56&amp;r2=1.57";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.56&amp;r2=1.57">Version
 1.57</a>:加入&quot;软件之外&quot;一节。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.45&amp;r2=1.46";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.45&amp;r2=1.46">Version
 1.46</a>:å…
³äºŽè‡ªç”±è¿è¡Œè½¯ä»¶çš„权利,用户的意图才是更重要的。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.40&amp;r2=1.41";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.40&amp;r2=1.41">Version
 1.41</a>:针对基于合同的许可证,修改了一些措辞。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.39&amp;r2=1.40";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.39&amp;r2=1.40">Version
 1.40</a>:自由软件许可证必须å…
è®¸ç”¨æˆ·ä½¿ç”¨ç¬¬ä¸‰æ–¹è‡ªç”±è½¯ä»¶çš„代码来做出自己的修改。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.38&amp;r2=1.39";>Version
-1.39</a>:如果用户发布了某个自由软件,那么自由软件的许可证有权利要求软件的发布è€
…提供源代码——哪怕该发布者不是软件的原作者。</li>
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.38&amp;r2=1.39">Version
+1.39</a>:澄清软件许可证要求软件的发布者提供源代ç 
æ˜¯å¯ä»¥çš„。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.30&amp;r2=1.31";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.30&amp;r2=1.31">Version
 1.31</a>:自由软件的许可证有权利要求软件的修改者
在发布修改版本时提供自己的个人信息。其他几
处也做了小修改。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.22&amp;r2=1.23";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.22&amp;r2=1.23">Version
 
1.23</a>:讨论了基于合同的自由软件许可证可能存在的潜在问题。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.15&amp;r2=1.16";>Version
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.15&amp;r2=1.16">Version
 1.16</a>:解释了为什么发布二进制可执行文件很重要。</li>
 
 <li><a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.10&amp;r2=1.11";>Version
-1.11</a>:自由软件许可证可以要求软件发布者给原作者
提供一份发布的拷贝。该发布者
可以是发布原软件,也可能是发布修改后的版本。</li>
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.10&amp;r2=1.11">Version
+1.11</a>:自由软件许可证可以要求软件发布者给以前的作者
提供一份发布版的拷贝。</li>
 
 </ul>
 
 <p>该列表并非包括全部修改记录,而仅仅是包
含了一些重要修正。比如,本列表不会包
括对拼写错误,错别字等小问题的修改。如果想要看到å…
¨éƒ¨çš„修改里时,请参见<a
-href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log";>CVS日志</a>。</p>
-<hr class="column-limit" />
+href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log">CVS日志</a>。</p>
+<div class="column-limit"></div>
 
 <h3 class="footnote">脚注</h3>
 <ol>
@@ -516,8 +510,7 @@
      
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright &copy; 1996-2002, 2004-2007, 2009-2019, 2021 Free Software
-Foundation, Inc.</p>
+<p>Copyright &copy; 1996-2002, 2004-2019, 2021 Free Software Foundation, 
Inc.</p>
 
 <p>本页面采用<a rel="license"
 href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative Commons
@@ -535,7 +528,7 @@
 <p class="unprintable"><!-- timestamp start -->
 最后更新:
 
-$Date: 2021/08/19 08:13:18 $
+$Date: 2021/09/01 09:34:29 $
 
 <!-- timestamp end -->
 </p>

Index: po/free-sw.zh-cn-en.html
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-cn-en.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- po/free-sw.zh-cn-en.html    19 Aug 2021 08:13:25 -0000      1.15
+++ po/free-sw.zh-cn-en.html    1 Sep 2021 09:34:30 -0000       1.16
@@ -8,10 +8,7 @@
 <style type="text/css" media="print,screen"><!--
 .toc > ul > li { list-style-type: none; font-weight: bold; }
 .toc ul { font-weight: normal; }
-.note { margin-left: 6%; margin-right: 6%; }
-@media (min-width: 48em) {
-   .note { margin-top: .8em; }
-}
+#History ~ p, #History ~ ul { font-size: 1rem; }
 --></style>
 <meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" />
 <meta http-equiv="Description" content="Since 1983, developing the free Unix 
style operating system GNU, so that computer users can have the freedom to 
share and improve the software they use." />
@@ -20,11 +17,10 @@
 <!--#include virtual="/philosophy/ph-breadcrumb.html" -->
 <!--GNUN: OUT-OF-DATE NOTICE-->
 <!--#include virtual="/server/top-addendum.html" -->
-<div class="reduced-width">
+<div class="article reduced-width">
 <h2>What is Free Software?</h2>
 <div class="thin"></div>
 
-<div class="article">
 <div class="important">
 <p>
 &ldquo;Free software&rdquo; means software that respects users'
@@ -106,7 +102,7 @@
 </ul>
 </div>
 
-<div class="edu-note" id="fsf-licensing">
+<div class="edu-note" id="fsf-licensing" role="complementary">
 <p style="font-size:80%">
 Have a question about free software licensing not answered here?
 See our other <a href="http://www.fsf.org/licensing";>licensing resources</a>,
@@ -116,7 +112,7 @@
 </div>
 
 
-<h3 id="fs-definition" class="subheader">The Free Software Definition</h3>
+<h3 id="fs-definition">The Free Software Definition</h3>
 
 <p>
 The free software definition presents the criteria for whether a
@@ -205,7 +201,7 @@
 </p>
 
 
-<h3 id="clarifying" class="subheader">Clarifying the Boundary Between Free and 
Nonfree</h3>
+<h3 id="clarifying">Clarifying the Boundary Between Free and Nonfree</h3>
 
 <p>In the rest of this article we explain more precisely how far the
 various freedoms need to extend, on various issues, in order for a
@@ -453,7 +449,7 @@
 it is nonfree.
 </p>
 
-<h3 id="in-practice" class="subheader">The Free Software Definition in 
Practice</h3>
+<h3 id="in-practice">The Free Software Definition in Practice</h3>
 
 <h4 id="interpretation">How we interpret these criteria</h4>
 
@@ -516,7 +512,7 @@
 word &ldquo;open&rdquo; never refers to freedom.
 </p>
 
-<h3 id="beyond-software" class="subheader">Beyond Software</h3>
+<h3 id="beyond-software">Beyond Software</h3>
 
 <p>
 <a href="/philosophy/free-doc.html">Software manuals must be free</a>,
@@ -537,8 +533,6 @@
 has been extended to a definition of <a href="http://freedomdefined.org/";>
 free cultural works</a> applicable to any kind of works.
 </p>
-<hr class="column-limit" />
-</div>
 
 <h3 id="History">History</h3>
 
@@ -548,80 +542,80 @@
 
 <ul>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.168&amp;r2=1.169";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.168&amp;r2=1.169">Version
 1.169</a>: Explain more clearly why the four freedoms must apply
 to commercial activity.  Explain why the four freedoms imply the
 freedom not to run the program and the freedom to delete it, so there
 is no need to state those as separate requirements.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.164&amp;r2=1.165";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.164&amp;r2=1.165">Version
 1.165</a>: Clarify that arbitrary annoyances in the code do not
 negate freedom 0, and that freedoms 1 and 3 enable users to remove them.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.152&amp;r2=1.153";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.152&amp;r2=1.153">Version
 1.153</a>: Clarify that freedom to run the program means nothing stops
 you from making it run.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.140&amp;r2=1.141";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.140&amp;r2=1.141">Version
 1.141</a>: Clarify which code needs to be free.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.134&amp;r2=1.135";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.134&amp;r2=1.135">Version
 1.135</a>: Say each time that freedom 0 is the freedom to run the program
 as you wish.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.133&amp;r2=1.134";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.133&amp;r2=1.134">Version
 1.134</a>: Freedom 0 is not a matter of the program's functionality.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.130&amp;r2=1.131";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.130&amp;r2=1.131">Version
 1.131</a>: A free license may not require compliance with a nonfree license
 of another program.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.128&amp;r2=1.129";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.128&amp;r2=1.129">Version
 1.129</a>: State explicitly that choice of law and choice of forum
 specifications are allowed.  (This was always our policy.)</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.121&amp;r2=1.122">Version
 1.122</a>: An export control requirement is a real problem if the
 requirement is nontrivial; otherwise it is only a potential problem.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.117&amp;r2=1.118";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.117&amp;r2=1.118">Version
 1.118</a>: Clarification: the issue is limits on your right to modify,
 not on what modifications you have made.  And modifications are not limited
 to &ldquo;improvements&rdquo;</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.110&amp;r2=1.111";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.110&amp;r2=1.111">Version
 1.111</a>: Clarify 1.77 by saying that only
 retroactive <em>restrictions</em> are unacceptable.  The copyright
 holders can always grant additional <em>permission</em> for use of the
 work by releasing the work in another way in parallel.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.104&amp;r2=1.105";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.104&amp;r2=1.105">Version
 1.105</a>: Reflect, in the brief statement of freedom 1, the point
 (already stated in version 1.80) that it includes really using your modified
 version for your computing.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.91&amp;r2=1.92";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.91&amp;r2=1.92">Version
 1.92</a>: Clarify that obfuscated code does not qualify as source code.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.89&amp;r2=1.90";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.89&amp;r2=1.90">Version
 1.90</a>: Clarify that freedom 3 means the right to distribute copies
 of your own modified or improved version, not a right to participate
 in someone else's development project.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.88&amp;r2=1.89";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.88&amp;r2=1.89">Version
 1.89</a>: Freedom 3 includes the right to release modified versions as
 free software.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.79&amp;r2=1.80";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.79&amp;r2=1.80">Version
 1.80</a>: Freedom 1 must be practical, not just theoretical;
 i.e., no tivoization.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.76&amp;r2=1.77";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.76&amp;r2=1.77">Version
 1.77</a>: Clarify that all retroactive changes to the license are
 unacceptable, even if it's not described as a complete
 replacement.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.73&amp;r2=1.74";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.73&amp;r2=1.74">Version
 1.74</a>: Four clarifications of points not explicit enough, or stated
 in some places but not reflected everywhere:
 <ul>
@@ -635,38 +629,38 @@
 </ul>
 </li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.56&amp;r2=1.57";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.56&amp;r2=1.57">Version
 1.57</a>: Add &quot;Beyond Software&quot; section.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.45&amp;r2=1.46";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.45&amp;r2=1.46">Version
 1.46</a>: Clarify whose purpose is significant in the freedom to run
 the program for any purpose.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.40&amp;r2=1.41";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.40&amp;r2=1.41">Version
 1.41</a>: Clarify wording about contract-based licenses.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.39&amp;r2=1.40";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.39&amp;r2=1.40">Version
 1.40</a>: Explain that a free license must allow to you use other
 available free software to create your modifications.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.38&amp;r2=1.39";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.38&amp;r2=1.39">Version
 1.39</a>: Note that it is acceptable for a license to require you to
 provide source for versions of the software you put into public
 use.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.30&amp;r2=1.31";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.30&amp;r2=1.31">Version
 1.31</a>: Note that it is acceptable for a license to require you to
 identify yourself as the author of modifications.  Other minor
 clarifications throughout the text.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.22&amp;r2=1.23";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.22&amp;r2=1.23">Version
 1.23</a>: Address potential problems related to contract-based
 licenses.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.15&amp;r2=1.16";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.15&amp;r2=1.16">Version
 1.16</a>: Explain why distribution of binaries is important.</li>
 
-<li><a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.10&amp;r2=1.11";>Version
+<li><a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;r1=1.10&amp;r2=1.11">Version
 1.11</a>: Note that a free license may require you to send a copy of
 versions you distribute to previous developers on request.</li>
 
@@ -677,9 +671,9 @@
 interpretations.  For instance, the list does not include changes in
 asides, formatting, spelling, punctuation, or other parts of the page.
 You can review the complete list of changes to the page through
-the <a 
href="http://web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log";>cvsweb
+the <a 
href="//web.cvs.savannah.gnu.org/viewvc/www/philosophy/free-sw.html?root=www&amp;view=log">cvsweb
 interface</a>.</p>
-<hr class="column-limit" />
+<div class="column-limit"></div>
 
 <h3 class="footnote">Footnote</h3>
 <ol>
@@ -738,7 +732,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1996-2002, 2004-2007, 2009-2019, 2021
+<p>Copyright &copy; 1996-2002, 2004-2019, 2021
 Free Software Foundation, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -749,7 +743,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/08/19 08:13:25 $
+$Date: 2021/09/01 09:34:30 $
 <!-- timestamp end -->
 </p>
 </div>

Index: po/free-sw.zh-cn.po
===================================================================
RCS file: /web/www/www/philosophy/po/free-sw.zh-cn.po,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- po/free-sw.zh-cn.po 1 Sep 2021 09:18:25 -0000       1.55
+++ po/free-sw.zh-cn.po 1 Sep 2021 09:34:30 -0000       1.56
@@ -15,7 +15,6 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Outdated-Since: 2021-08-21 06:55+0000\n"
 "X-Generator: Poedit 1.7.5\n"
 
 #. type: Content of: <title>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]