Some editorial changes.

Commenting on one: the initial-caps stylistic preference for "Free
Software" (though it contradicts prevailing usage, including that of RMS
and the FSF) ought to be respected, but I think it is confusing to
capitalize the 'S' when referring to nonfree software as "non-Free
Software". So I changed this to "non-Free software" and also implicitly
acknowledged that the preference for "non-Free" over "nonfree" is the
editor-in-chief's stylistic idiosyncrasy.
This commit is contained in:
Richard Fontana 2014-12-06 21:14:21 -08:00 committed by Bradley M. Kuhn
parent 170f507ac6
commit 628ffb6020

View file

@ -191,15 +191,15 @@ Software freedom is only complete when no restrictions are imposed on how
these freedoms are exercised. Specifically, users and programmers can
exercise these freedoms noncommercially or commercially. Licenses that grant
these freedoms for noncommercial activities but prohibit them for commercial
activities are considered non-free. Even the Open Source Initiative
(\defn{OSI}) (the arbiter of what is considered ``Open Source'') also rules
such licenses not in fitting with its ``Open Source Definition''.
activities are considered non-free. The Open Source Initiative
(\defn{OSI}) (the arbiter of what is considered ``Open Source'') also regards
such licenses as inconsistent with its ``Open Source Definition''.
In general, software for which any of these freedoms are
restricted in any way is called ``non-Free Software.'' Typically, the
term ``proprietary software'' is used more or less interchangeably with
``non-Free Software.'' Personally, I tend to use the term ``non-Free
Software'' to refer to noncommercial software that restricts freedom
restricted in any way is called ``nonfree'' (or as I prefer to write it, ``non-Free'') software. Some use the
term ``proprietary software'' more or less interchangeably with
``non-Free software.'' Personally, I tend to use the term ``non-Free
software'' to refer to software available noncommercially that restricts freedom
(such as ``shareware'') and ``proprietary software'' to refer to
commercial software that restricts freedom (such as nearly all of
Microsoft's and Oracle's offerings).