summaryrefslogtreecommitdiff
path: root/docs/categories.md
diff options
context:
space:
mode:
authornadebula <rliang06@ruc.edu.cn>2016-09-16 14:57:22 +0800
committerGitHub <noreply@github.com>2016-09-16 14:57:22 +0800
commit4561da08042f97366501e5e4bd60e08562136a98 (patch)
tree40cb86ca867f9cd7e91928d0bb6532ed5a7d344d /docs/categories.md
parent04abd09abe90b9801c2d081352c3bca51db9cb6b (diff)
downloadfsfs-zh-4561da08042f97366501e5e4bd60e08562136a98.tar.xz
Minor revision
Minor revision on Sep. 16th
Diffstat (limited to 'docs/categories.md')
-rw-r--r--docs/categories.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/categories.md b/docs/categories.md
index 2ebf7a4..2802e0e 100644
--- a/docs/categories.md
+++ b/docs/categories.md
@@ -13,7 +13,7 @@ title: Untitled Document
自由与非自由软件的分类
======================
-@firstcopyingnotice{{ 参见 “Words to Avoid (or Use with Care) Because They Are Loaded or Confusing” (@pageref{Words to Avoid})一文。@medskip @footnoterule @smallskip 著作权所有 (C) 1996–1998, 2001, 2006, 2007, 2009, 2011, 2012, 2014, 2015 自由软件基金会。{本文最初于 1996 年发表于 <http://gnu.org>此版本是 @fsfsthreecite的一部分。}
+@firstcopyingnotice{{ 参见 “Words to Avoid (or Use with Care) Because They Are Loaded or Confusing” (@pageref{Words to Avoid})一文。@medskip @footnoterule @smallskip 著作权所有 (C) 1996–1998, 2001, 2006, 2007, 2009, 2011, 2012, 2014, 2015 自由软件基金会。{本文最初于 1996 年发表于 <http://gnu.org>。此版本是 @fsfsthreecite的一部分。}
![category](category-zh.png)
@@ -151,7 +151,7 @@ limited set of safe added requirements can be allowed) and require
making source code available. This shields the program, and its modified
versions, from some of the common ways of making a program proprietary.
-左版软件是一类自由软件,其发布条款可以保证它的所有版本的所有副本都带有或多或少地相同的发布条款。例如,这意味着左版许可证意味着禁止他人为该软件添加额外的限制条款(尽管一系列有限的、安全添加的要求可能被允许),并且要求源代码可获得。这可以保护该程序及其修改版本,使得某些常见的方式不能将其变为私有软件。
+左版软件是一类自由软件,其发布条款可以保证它的所有版本的所有副本都带有或多或少地相同的发布条款。例如,这意味着左版许可证普遍禁止他人为该软件添加额外的限制条款(尽管一系列有限的、安全添加的要求可能被允许),并且要求源代码可获得。这可以保护该程序及其修改版本,使得某些常见的方式不能将其变为私有软件。
Some copyleft licenses, such as GPL version 3, block other means of
turning software proprietary, such as tivoization.[(4)](#FOOT4)