CVSROOT: /web/www
Module name: www
Changes by: James Turner <jturner> 11/09/22 14:52:35
Modified files:
philosophy : android-and-users-freedom.html
Log message:
Change a couple links RT #709800
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/android-and-users-freedom.html?cvsroot=www&r1=1.2&r2=1.3
Patches:
Index: android-and-users-freedom.html
===================================================================
RCS file: /web/www/www/philosophy/android-and-users-freedom.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- android-and-users-freedom.html 22 Sep 2011 14:45:04 -0000 1.2
+++ android-and-users-freedom.html 22 Sep 2011 14:52:24 -0000 1.3
@@ -51,9 +51,7 @@
<p>Within Android, Linux the kernel remains a separate program, with its
source code under <a href="http://www.gnu.org/licenses/gpl-2.0.html";>GNU GPL
version 2</a>. To combine Linux with code under the Apache 2.0 license would
-be <a
-href="http://www.gnu.org/licenses/gpl-faq.html#GPLIncompatibleLibs";>copyright
-infringement</a>, since GPL version 2 and Apache 2.0 are <a
+be copyright infringement, since GPL version 2 and Apache 2.0 are <a
href="http://www.gnu.org/licenses/license-list.html#apache2";>incompatible</a>.
Rumors that Google has somehow converted Linux to the Apache license are
erroneous; Google has no power to change the license on the code of Linux, and
@@ -81,8 +79,9 @@
<p>The nonrelease of two versions' source code raises concern that Google
might intend to turn Android proprietary permanently; that the release
of some Android versions as free software may have been a temporary
-ploy to get community assistance in improving a proprietary software
-product. Let us hope does not happen.</p>
+ploy to get community assistance in improving a <a
+href="http://www.gnu.org/philosophy/categories.html#ProprietarySoftware";>proprietary
+software</a> product. Let us hope does not happen.</p>
<p>In any case, most of the source code of some versions of Android has
been released as free software. Does that mean that products using
@@ -212,7 +211,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2011/09/22 14:45:04 $
+$Date: 2011/09/22 14:52:24 $
<!-- timestamp end -->
</p>
</div>
