www/server/staging/proprietary/rec mobiles-stub...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 18/10/05 14:10:57

Modified files:
        server/staging/proprietary/rec: mobiles-stub.html 
                                        microsoft-stub.html 

Log message:
        Fix keywords.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/proprietary/rec/mobiles-stub.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/proprietary/rec/microsoft-stub.html?cvsroot=www&r1=1.6&r2=1.7

Patches:
Index: mobiles-stub.html
===================================================================
RCS file: /webcvs/www/www/server/staging/proprietary/rec/mobiles-stub.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- mobiles-stub.html   24 Sep 2018 21:08:59 -0000      1.6
+++ mobiles-stub.html   5 Oct 2018 18:10:56 -0000       1.7
@@ -19,7 +19,7 @@
 <p><a href="/proprietary/proprietary.html">Other examples of proprietary
 malware</a></p>
 
-<div class="highlight-para">
+<div class="comment">
 <p>
 <em>Malware</em> means software designed to function in ways that
 mistreat or harm the user.  (This does not include accidental errors.)
@@ -40,13 +40,21 @@
 <p>Nearly all mobile phones do two grievous wrongs to their users:
 tracking their movements, and listening to their conversations.  This
 is why we call them &ldquo;Stalin's dream&rdquo;.</p>
+</div>
+
+<p>The malware we list here is present in every phone, or in software
+that is not made by Apple or Google (including its subsidiaries, for
+instance Motorola between 2011 and 2014). Malware that these companies
+are (or were) directly responsible for is listed in dedicated pages: <a
+href="/proprietary/malware-apple.html">Apple's Operating Systems are
+Malware</a>, and <a href="/proprietary/malware-google.html">Google's
+Software Is Malware</a>.</p>
 
 <p>If you know of an example that ought to be in this page but isn't
 here, please write
 to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>
 to inform us. Please include the URL of a trustworthy reference or two
 to present the specifics.</p>
-</div>
 
 <ul class="blurbs">
   <li><p>The phone network
@@ -129,13 +137,13 @@
   they do not count as malware. We mention them to refute the
   supposition that prestigious proprietary software doesn't have grave
   bugs.</p>
-<!-- INSERT insecurity.list -->
+<!-- INSERT mobiles-insec.list -->
 
 <h3 id="jails">Mobile Jails</h3>
 <!-- INSERT jails.list -->
 
 <h3 id="surveillance">Mobile Surveillance</h3>
-<!-- INSERT surveillance.list -->
+<!-- INSERT mobiles-surv.list -->
 
 <h3 id="tyrants">Mobile Tyrants</h3>
 <!-- INSERT tyrants.list -->
@@ -197,7 +205,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/09/24 21:08:59 $
+$Date: 2018/10/05 18:10:56 $
 <!-- timestamp end -->
 </p>
 </div>

Index: microsoft-stub.html
===================================================================
RCS file: /webcvs/www/www/server/staging/proprietary/rec/microsoft-stub.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- microsoft-stub.html 26 Sep 2018 19:07:43 -0000      1.6
+++ microsoft-stub.html 5 Oct 2018 18:10:56 -0000       1.7
@@ -99,7 +99,7 @@
 <!-- INSERT subscriptions.list -->
 
 <h3 id="surveillance">Microsoft Surveillance</h3>
-<!-- INSERT surveillance.list -->
+<!-- INSERT microsoft-surv.list -->
 
 <h3 id="tyrants">Microsoft Tyrants</h3>
 <!-- INSERT tyrants.list -->
@@ -164,7 +164,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/09/26 19:07:43 $
+$Date: 2018/10/05 18:10:56 $
 <!-- timestamp end -->
 </p>
 </div>