www-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/proprietary/po malware-microsoft.de-diff.ht...

From: GNUN
Subject: www/proprietary/po malware-microsoft.de-diff.ht...
Date: Sun, 7 Oct 2018 15:58:32 -0400 (EDT) 
CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     18/10/07 15:58:31

Modified files:
        proprietary/po : malware-microsoft.de-diff.html 
                         malware-microsoft.de.po malware-microsoft.es.po 
                         malware-microsoft.fr.po 
                         malware-microsoft.it-diff.html 
                         malware-microsoft.it.po 
                         malware-microsoft.ja-diff.html 
                         malware-microsoft.ja.po malware-microsoft.pot 
                         malware-microsoft.ru.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-microsoft.de-diff.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-microsoft.de.po?cvsroot=www&r1=1.122&r2=1.123
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-microsoft.es.po?cvsroot=www&r1=1.119&r2=1.120
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-microsoft.fr.po?cvsroot=www&r1=1.134&r2=1.135
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-microsoft.it-diff.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-microsoft.it.po?cvsroot=www&r1=1.127&r2=1.128
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-microsoft.ja-diff.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-microsoft.ja.po?cvsroot=www&r1=1.102&r2=1.103
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-microsoft.pot?cvsroot=www&r1=1.67&r2=1.68
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/po/malware-microsoft.ru.po?cvsroot=www&r1=1.174&r2=1.175

Patches:
Index: malware-microsoft.de-diff.html
===================================================================
RCS file: /web/www/www/proprietary/po/malware-microsoft.de-diff.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- malware-microsoft.de-diff.html      5 Oct 2018 17:29:55 -0000       1.12
+++ malware-microsoft.de-diff.html      7 Oct 2018 19:58:31 -0000       1.13
@@ -27,7 +27,7 @@
 &lt;p&gt;&lt;a href="/proprietary/proprietary.html"&gt;Other examples of 
proprietary
 malware&lt;/a&gt;&lt;/p&gt;
 
-&lt;div class="highlight-para"&gt;
+&lt;div <span 
class="removed"><del><strong>class="highlight-para"&gt;</strong></del></span> 
<span class="inserted"><ins><em>class="comment"&gt;</em></ins></span>
 &lt;p&gt;
 &lt;em&gt;Malware&lt;/em&gt; means software designed to function in ways that
 mistreat or harm the user.  (This does not include accidental errors.)
@@ -45,15 +45,18 @@
 because the developer's awareness that the users would be powerless to fix
 any malicious functionalities tempts the developer to impose some.
 &lt;/p&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
 
+&lt;div <span class="removed"><del><strong>class="summary" 
style="margin-top:</strong></del></span> <span 
class="inserted"><ins><em>class="important" 
style="margin-bottom:</em></ins></span> 2em"&gt;
 <span class="inserted"><ins><em>&lt;p&gt;If you know of an example that ought 
to be in this page but isn't
 here, please write
 to &lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;
 to inform us. Please include the URL of a trustworthy reference or two
-to present the specifics.&lt;/p&gt;</em></ins></span>
+to present the specifics.&lt;/p&gt;
+&lt;/div&gt;
 &lt;/div&gt;
 
-&lt;div class="summary" style="margin-top: 2em"&gt;
+&lt;div class="summary"&gt;</em></ins></span>
 &lt;h3&gt;Type&nbsp;of malware&lt;/h3&gt;
 &lt;ul&gt;
   &lt;li&gt;&lt;a href="#back-doors"&gt;Back doors&lt;/a&gt;&lt;/li&gt;
@@ -87,7 +90,7 @@
   &lt;li&gt;&lt;p&gt;Microsoft</strong></del></span>
 
 <span class="inserted"><ins><em>&lt;ul class="blurbs"&gt;
-&lt;!-- INSERT backdoor --&gt;
+&lt;!-- INSERT microsoft-back-door --&gt;
   &lt;li id="M201608172"&gt;
     &lt;p id="windows-update"&gt;Microsoft</em></ins></span>
     Windows has a universal back door through which &lt;a
@@ -125,6 +128,15 @@
     door capabilities of the TPM 2.0 chip.&lt;/p&gt;
   &lt;/li&gt;
 
+  &lt;li id="M201307300"&gt;
+    &lt;p&gt;Here is a suspicion that
+    we can't prove, but is worth thinking about: &lt;a
+    
href="https://web.archive.org/web/20150206003913/http://www.afr.com/p/technology/intel_chips_could_be_nsa_key_to_ymrhS1HS1633gCWKt5tFtI"&gt;
+    Writable microcode for Intel and AMD microprocessors&lt;/a&gt; may be a
+    vehicle for the NSA to invade computers, with the help of Microsoft,
+    say respected security experts.&lt;/p&gt;
+  &lt;/li&gt;
+
   &lt;li id="M201112081"&gt;
     &lt;p&gt;Windows 8</em></ins></span> also has a back door for <span 
class="inserted"><ins><em>&lt;a
     
href="http://www.computerworld.com/article/2500036/desktop-apps/microsoft--we-can-remotely-delete-windows-8-apps.html"&gt;</em></ins></span>
@@ -146,7 +158,7 @@
 &lt;h3 id="drm"&gt;Microsoft DRM&lt;/h3&gt;
 
 &lt;ul class="blurbs"&gt;
-&lt;!-- INSERT DRM --&gt;</em></ins></span>
+&lt;!-- INSERT microsoft-dr --&gt;</em></ins></span>
   &lt;li <span 
class="removed"><del><strong>id="windows7-back-door"&gt;&lt;p&gt;Users reported 
that &lt;a 
     
href="http://www.networkworld.com/article/2993490/windows/windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-users.html#tk.rss_all"&gt;
     Microsoft was forcing them to replace Windows 7 and 8 with all-spying 
@@ -184,7 +196,7 @@
 &lt;li&gt;</strong></del></span>
 
 <span class="inserted"><ins><em>&lt;ul class="blurbs"&gt;
-&lt;!-- INSERT insecurity --&gt;
+&lt;!-- INSERT microsoft-insec --&gt;
   &lt;li id="M201705120"&gt;</em></ins></span>
     &lt;p&gt;Exploits of bugs in Windows, which were developed by the NSA
     and then leaked by the Shadowbrokers group, are now being used to &lt;a
@@ -211,20 +223,28 @@
     turned into a botnet for the purpose of collecting customers' credit
     card
 <span class="removed"><del><strong>numbers&lt;/a&gt;.
-&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>numbers.&lt;/p&gt;
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>numbers.&lt;/p&gt;</em></ins></span>
   &lt;/li&gt;
 &lt;/ul&gt;
 
 
-&lt;h3 id="interference"&gt;Microsoft Interference&lt;/h3&gt;
+&lt;h3 <span class="removed"><del><strong>id="sabotage"&gt;Microsoft 
Sabotage&lt;/h3&gt;
+
+&lt;p&gt;The wrongs in this section are not precisely malware, since they do
+not involve making the program that runs in a way that 
hurts</strong></del></span> <span 
class="inserted"><ins><em>id="interference"&gt;Microsoft Interference&lt;/h3&gt;
 
-&lt;p&gt;Various proprietary programs often mess up the user's system. They
-are like sabotage, but they are not grave enough to qualify for the word
+&lt;p&gt;Various proprietary programs often mess up</em></ins></span> the 
<span class="removed"><del><strong>user.
+But they</strong></del></span> <span class="inserted"><ins><em>user's system. 
They</em></ins></span>
+are <span class="removed"><del><strong>a lot</strong></del></span> like <span 
class="removed"><del><strong>malware, since</strong></del></span> <span 
class="inserted"><ins><em>sabotage, but</em></ins></span> they are <span 
class="removed"><del><strong>technical Microsoft
+actions that harm</strong></del></span> <span class="inserted"><ins><em>not 
grave enough</em></ins></span> to <span class="inserted"><ins><em>qualify 
for</em></ins></span> the <span 
class="removed"><del><strong>users</strong></del></span> <span 
class="inserted"><ins><em>word
 &ldquo;sabotage&rdquo;. Nonetheless, they are nasty and wrong. This
-section describes examples of Microsoft committing interference.&lt;/p&gt;
+section describes examples</em></ins></span> of <span 
class="removed"><del><strong>specific</strong></del></span> Microsoft <span 
class="removed"><del><strong>software.&lt;/p&gt;
+
+&lt;ul&gt;
+  &lt;li&gt;&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>committing interference.&lt;/p&gt;
 
 &lt;ul class="blurbs"&gt;
-&lt;!-- INSERT interference --&gt;
+&lt;!-- INSERT microsoft-interf --&gt;
   &lt;li id="M201809120"&gt;
     &lt;p&gt;One version of Windows 10 &lt;a
     
href="https://www.ghacks.net/2018/09/12/microsoft-intercepting-firefox-chrome-installation-on-windows-10/"&gt;
@@ -236,276 +256,261 @@
     
href="https://www.theguardian.com/technology/2018/mar/19/windows-10-microsoft-force-people-edge-browser-windows-mail-chrome-firefox"&gt;
     impose use of its browser, Edge, in certain 
circumstances&lt;/a&gt;.&lt;/p&gt;
 
-    &lt;p&gt;The reason Microsoft can force things on users is that Windows
+    &lt;p&gt;The reason</em></ins></span> Microsoft <span 
class="inserted"><ins><em>can force things on users is that Windows
     is nonfree.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201703170"&gt;
-    &lt;p&gt;Windows displays &lt;a
-    
href="http://www.theverge.com/2017/3/17/14956540/microsoft-windows-10-ads-taskbar-file-explorer"&gt;
-    intrusive ads for Microsoft products and its partners'
+    &lt;p&gt;Windows displays</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="https://arstechnica.com/information-technology/2017/04/new-processors-are-now-blocked-from-receiving-updates-on-old-windows/"&gt;
+       has dropped support</strong></del></span>
+    <span 
class="inserted"><ins><em>href="http://www.theverge.com/2017/3/17/14956540/microsoft-windows-10-ads-taskbar-file-explorer"&gt;
+    intrusive ads</em></ins></span> for <span 
class="removed"><del><strong>Windows 7</strong></del></span> <span 
class="inserted"><ins><em>Microsoft products</em></ins></span> and <span 
class="removed"><del><strong>8 on recent processors&lt;/a&gt;
+      in</strong></del></span> <span class="inserted"><ins><em>its partners'
     products&lt;/a&gt;.&lt;/p&gt;
 
-    &lt;p&gt;The article's author starts from the premise that Microsoft has
-    a right to control what Windows does to users, as long as it doesn't
-    go &ldquo;too far&rdquo;. We disagree.&lt;/p&gt;
+    &lt;p&gt;The article's author starts from the premise that Microsoft 
has</em></ins></span>
+    a <span class="removed"><del><strong>big hurry.&lt;/p&gt;
+    &lt;p&gt;It makes no difference</strong></del></span> <span 
class="inserted"><ins><em>right to control</em></ins></span> what <span 
class="removed"><del><strong>legitimate reasons Microsoft might
+      have for not doing work</strong></del></span> <span 
class="inserted"><ins><em>Windows does</em></ins></span> to <span 
class="removed"><del><strong>support them. If</strong></del></span> <span 
class="inserted"><ins><em>users, as long as</em></ins></span> it doesn't <span 
class="removed"><del><strong>want to
+      do this work, it should let users do the 
work.&lt;/p&gt;</strong></del></span>
+    <span class="inserted"><ins><em>go &ldquo;too far&rdquo;. We 
disagree.&lt;/p&gt;</em></ins></span>
   &lt;/li&gt;
 
-  &lt;li id="M201608170"&gt;
+  <span class="removed"><del><strong>&lt;li&gt;
+    &lt;p&gt;Microsoft has made</strong></del></span>
+
+  <span class="inserted"><ins><em>&lt;li id="M201608170"&gt;
     &lt;p&gt; After &lt;a 
href="/proprietary/malware-microsoft.html#windows10-forcing"&gt;forcing the 
download of Windows 10&lt;/a&gt;
-    on computers that were running Windows 7 and 8, Microsoft &lt;a
-    
href="http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html"&gt;
-    repeatedly switched on a flag that urged users to
-    &ldquo;upgrade&rdquo; to Windows 10&lt;/a&gt; when they had turned
+    on computers that were running</em></ins></span> Windows 7 and <span 
class="removed"><del><strong>8 cease to function on certain
+      new computers,</strong></del></span> <span class="inserted"><ins><em>8, 
Microsoft</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="https://support.microsoft.com/en-us/help/4012982/discusses-an-issue-in-which-you-receive-a-your-pc-uses-a-processor-tha"&gt;effectively
+      forcing their owners</strong></del></span>
+    <span 
class="inserted"><ins><em>href="http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html"&gt;
+    repeatedly switched on a flag that urged users</em></ins></span> to <span 
class="removed"><del><strong>switch</strong></del></span>
+    <span class="inserted"><ins><em>&ldquo;upgrade&rdquo;</em></ins></span> to 
Windows <span class="removed"><del><strong>10&lt;/a&gt;.&lt;/p&gt;
+  &lt;/li&gt;
+
+  &lt;li&gt;&lt;p&gt;Once</strong></del></span> <span 
class="inserted"><ins><em>10&lt;/a&gt; when they had turned
     it off, in the hope that some day they would fail to say no.
-    To do this, Microsoft used &lt;a
+    To do this,</em></ins></span> Microsoft <span 
class="removed"><del><strong>has tricked a user into accepting 
installation</strong></del></span> <span class="inserted"><ins><em>used &lt;a
     
href="https://www.theregister.co.uk/2016/03/17/microsoft_windows_10_upgrade_gwx_vs_humanity/"&gt;
     malware techniques&lt;/a&gt;.&lt;/p&gt;
 
     &lt;p&gt;A detailed &lt;a
     
href="https://www.eff.org/deeplinks/2016/08/windows-10-microsoft-blatantly-disregards-user-choice-and-privacy-deep-dive"&gt;
-    analysis of Microsoft's scheme&lt;/a&gt; is available on the Electronic
+    analysis</em></ins></span> of <span class="inserted"><ins><em>Microsoft's 
scheme&lt;/a&gt; is available on the Electronic
     Frontier Foundation's website.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201603090"&gt;
-    &lt;p&gt;Microsoft has made companies'
-    Windows machines managed by the company's sysadmins &lt;a
+    &lt;p&gt;Microsoft has made companies'</em></ins></span>
+    Windows
+   <span class="removed"><del><strong>10, &lt;a 
href="http://www.theregister.co.uk/2016/06/01/windows_10_nagware_no_way_out/"&gt;they
+   find that they are denied</strong></del></span> <span 
class="inserted"><ins><em>machines managed by</em></ins></span> the <span 
class="removed"><del><strong>option</strong></del></span> <span 
class="inserted"><ins><em>company's sysadmins &lt;a
     
href="http://www.infoworld.com/article/3042397/microsoft-windows/admins-beware-domain-attached-pcs-are-sprouting-get-windows-10-ads.html"&gt;harangue
-    users to complain to the sysadmins about not &ldquo;upgrading&rdquo;
-    to Windows 10&lt;/a&gt;.&lt;/p&gt;
+    users to complain</em></ins></span> to <span 
class="removed"><del><strong>cancel or even postpone</strong></del></span> the
+   <span class="removed"><del><strong>imposed date of installation&lt;/a&gt;.
+   &lt;/p&gt;
+   &lt;p&gt;This demonstrates what we've said for years: using proprietary
+   software means letting someone have power over you, and you're
+   going</strong></del></span> <span class="inserted"><ins><em>sysadmins about 
not &ldquo;upgrading&rdquo;</em></ins></span>
+    to <span class="removed"><del><strong>get screwed sooner or 
later.&lt;/p&gt;&lt;/li&gt;
+
+  &lt;li&gt;&lt;p&gt;Microsoft</strong></del></span> <span 
class="inserted"><ins><em>Windows 10&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201601160"&gt;
-    &lt;p&gt;Microsoft has &lt;a
+    &lt;p&gt;Microsoft</em></ins></span> has &lt;a
     
href="http://www.theverge.com/2016/1/16/10780876/microsoft-windows-support-policy-new-processors-skylake"&gt;desupported
     all future Intel CPUs for Windows 7 and 8&lt;/a&gt;. Those
     machines will be stuck with the nastier Windows 10.  &lt;a
     
href="http://gizmodo.com/only-the-latest-version-of-windows-will-run-on-some-fut-1753545825"&gt;
-    AMD and Qualcomm CPUs, too&lt;/a&gt;.&lt;/p&gt;
+    AMD and Qualcomm CPUs, <span class="removed"><del><strong>too&lt;/a&gt;.
+  &lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>too&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 
     &lt;p&gt;Of course, Windows 7 and 8 are unethical too, because they are
     proprietary software.  But this example of Microsoft's wielding its
-    power demonstrates the power it holds.&lt;/p&gt;
+    power demonstrates the power it <span class="removed"><del><strong>holds.
+  &lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>holds.&lt;/p&gt;</em></ins></span>
 
     &lt;p&gt;Free software developers also stop maintaining old versions of
     their programs, but this is not unfair to users because the users of
     free software have control over it.  If it is important enough to you,
     you and other users can hire someone to support the old version on
-    your future platforms.&lt;/p&gt;
+    your future <span class="removed"><del><strong>platforms.
+  &lt;/p&gt;&lt;/li&gt;
+
+  &lt;li&gt;&lt;p&gt;Microsoft
+    is &lt;a 
href="http://gizmodo.com/woman-wins-10-000-from-microsoft-after-unwanted-window-1782666146"&gt;
+    forcibly pushing Windows
+    update to its version 10&lt;/a&gt;, ignoring</strong></del></span> <span 
class="inserted"><ins><em>platforms.&lt;/p&gt;
   &lt;/li&gt;
 &lt;/ul&gt;
 
 
-&lt;h3 id="jails"&gt;Microsoft Jails&lt;/h3&gt;
+&lt;h3 id="sabotage"&gt;Microsoft Sabotage&lt;/h3&gt;
 
-&lt;ul class="blurbs"&gt;
-&lt;!-- INSERT jails --&gt;
-  &lt;li id="M201706130"&gt;
-    &lt;p&gt;Windows 10 S was a jail: &lt;a
-    
href="https://www.theguardian.com/technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison"&gt;
-    only programs from the Windows Store could be
-    installed and executed&lt;/a&gt;. It was however possible to &lt;a
-    
href="https://www.theverge.com/2017/6/13/15789998/microsoft-windows-10-s-upgrade-windows-10-pro-guide"&gt;
-    upgrade to Windows 10 Pro&lt;/a&gt;. The successor of Windows
-    10 S is a special configuration of Windows 10 called &lt;a
-    
href="https://support.microsoft.com/en-gb/help/4020089/windows-10-in-s-mode-faq"&gt;
-    S mode&lt;/a&gt;. The major difference with Windows 10 S is that there is
-    an easy way to switch out of S mode.&lt;/p&gt;
-  &lt;/li&gt;
+&lt;p&gt;The wrongs in this section are not precisely malware, since they do
+not involve making</em></ins></span> the <span 
class="removed"><del><strong>flag on Windows 7 or 8</strong></del></span> <span 
class="inserted"><ins><em>program</em></ins></span> that <span 
class="removed"><del><strong>you could set to not upgrade.  This 
reaffirms</strong></del></span> <span class="inserted"><ins><em>runs in a way 
that hurts</em></ins></span> the <span class="removed"><del><strong>presence 
of</strong></del></span> <span class="inserted"><ins><em>user.
+But they are</em></ins></span> a <span class="removed"><del><strong>&lt;a 
href="/proprietary/proprietary-back-doors.html"&gt;universal
+    back door in Windows&lt;/a&gt; 7 and 8.&lt;/p&gt;&lt;/li&gt;
 
-  &lt;li id="M201210080"&gt;
-    &lt;p&gt;&lt;a
-    
href="http://www.itworld.com/article/2832657/operating-systems/microsoft-metro-app-store-lock-down.html"&gt;
-    Windows 8 on &ldquo;mobile devices&rdquo; (now defunct) was a
-    jail&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
-  &lt;/li&gt;
-&lt;/ul&gt;
+  &lt;li&gt;&lt;p&gt;Windows 10 &ldquo;upgrades&rdquo; &lt;a
+      
href="http://www.ghacks.net/2015/11/24/beware-latest-windows-10-update-may-remove-programs-automatically/"&gt;
+      delete applications&lt;/a&gt; without asking 
permission.&lt;/p&gt;&lt;/li&gt;
 
+  &lt;li&gt;&lt;p&gt;
+  Microsoft is &lt;a 
href="http://www.theguardian.com/technology/2015/sep/11/microsoft-downloading-windows-1"&gt;
+  repeatedly nagging many users to install Windows 10&lt;/a&gt;.
+  &lt;/p&gt;&lt;/li&gt;
 
-&lt;h3 id="sabotage"&gt;Microsoft Sabotage&lt;/h3&gt;
+&lt;li&gt;&lt;p&gt;
+Microsoft was for months &lt;a
+href="http://www.theguardian.com/technology/2016/feb/02/microsoft-downloading-windows-10-automatic-update"&gt;
+tricking users into &ldquo;upgrading&rdquo; to Windows 10&lt;/a&gt;, 
if</strong></del></span> <span class="inserted"><ins><em>lot like malware, 
since</em></ins></span> they
+<span class="removed"><del><strong>failed to notice and say no.
+&lt;/p&gt;&lt;/li&gt;
 
-&lt;p&gt;The wrongs in this section are not precisely malware, since they do
-not involve making the program that runs in a way that hurts the user.
-But they are a lot like malware, since they are technical Microsoft
-actions that harm <span class="removed"><del><strong>to</strong></del></span> 
the users of specific Microsoft software.&lt;/p&gt;
+  &lt;li&gt;&lt;p&gt;&lt;a
+href="https://web.archive.org/web/20130622044225/http://blogs.computerworlduk.com/open-enterprise/2013/06/how-can-any-company-ever-trust-microsoft-again/index.htm"&gt;</strong></del></span>
 <span class="inserted"><ins><em>are technical</em></ins></span> Microsoft 
<span class="removed"><del><strong>informs</strong></del></span>
+<span class="inserted"><ins><em>actions that harm</em></ins></span> the <span 
class="removed"><del><strong>NSA</strong></del></span> <span 
class="inserted"><ins><em>users</em></ins></span> of <span 
class="removed"><del><strong>bugs in Windows before fixing 
them.&lt;/a&gt;&lt;/p&gt;&lt;/li&gt;
 
-<span class="removed"><del><strong>&lt;ul&gt;
-  &lt;li&gt;&lt;p&gt; Microsoft</strong></del></span>
+  &lt;li&gt;&lt;p&gt;&lt;a 
href="http://www.computerworlduk.com/blogs/open-enterprise/windows-xp-end-of-an-era-end-of-an-error-3569489/"&gt;</strong></del></span>
 <span class="inserted"><ins><em>specific</em></ins></span> Microsoft <span 
class="removed"><del><strong>cut off security fixes for</strong></del></span> 
<span class="inserted"><ins><em>software.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;ul class="blurbs"&gt;
-&lt;!-- INSERT sabotage --&gt;
+&lt;ul class="blurbs"&gt;
+&lt;!-- INSERT microsoft-sab --&gt;
   &lt;li id="M201704194"&gt;
-    &lt;p&gt;Microsoft has made Windows 7
-    and 8 cease to function on certain new computers, &lt;a
+    &lt;p&gt;Microsoft has made</em></ins></span> Windows <span 
class="removed"><del><strong>XP, except</strong></del></span> <span 
class="inserted"><ins><em>7
+    and 8 cease</em></ins></span> to <span class="removed"><del><strong>some 
big users
+  that pay exorbitantly.&lt;/a&gt;&lt;/p&gt;
+
+  &lt;p&gt;Microsoft is going</strong></del></span> <span 
class="inserted"><ins><em>function on certain new computers, &lt;a
     
href="https://support.microsoft.com/en-us/help/4012982/the-processor-is-not-supported-together-with-the-windows-version-that"&gt;effectively
-    forcing their owners to switch to Windows 10&lt;/a&gt;.&lt;/p&gt;
+    forcing their owners to switch</em></ins></span> to <span 
class="inserted"><ins><em>Windows 10&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201704130"&gt;
-    &lt;p&gt;Microsoft</em></ins></span> &lt;a
-    
href="https://arstechnica.com/information-technology/2017/04/new-processors-are-now-blocked-from-receiving-updates-on-old-windows/"&gt;
-    has dropped support for Windows 7 and 8 on recent processors&lt;/a&gt;
-    in a big hurry.&lt;/p&gt;
+    &lt;p&gt;Microsoft</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.computerworlduk.com/news/security/3605515/more-than-half-of-all-ie-users-face-patch-axe-in-10-months/"&gt;
+  cut off</strong></del></span>
+    <span 
class="inserted"><ins><em>href="https://arstechnica.com/information-technology/2017/04/new-processors-are-now-blocked-from-receiving-updates-on-old-windows/"&gt;
+    has dropped</em></ins></span> support for <span 
class="removed"><del><strong>some Internet Explorer 
versions&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>Windows 7 and 8 on recent 
processors&lt;/a&gt;</em></ins></span>
+    in <span class="removed"><del><strong>the same way.&lt;/p&gt;
+
+  &lt;p&gt;A person or company has the right</strong></del></span> <span 
class="inserted"><ins><em>a big hurry.&lt;/p&gt;
 
     &lt;p&gt;It makes no difference what legitimate reasons Microsoft might
-    have for not doing work to support them. If it doesn't want to do
-    this work, it should let users do the work.&lt;/p&gt;
+    have for not doing work</em></ins></span> to <span 
class="removed"><del><strong>cease</strong></del></span> <span 
class="inserted"><ins><em>support them. If it doesn't want</em></ins></span> to 
<span class="removed"><del><strong>work on a
+  particular program;</strong></del></span> <span class="inserted"><ins><em>do
+    this work, it should let users do</em></ins></span> the <span 
class="removed"><del><strong>wrong here is</strong></del></span> <span 
class="inserted"><ins><em>work.&lt;/p&gt;
   &lt;/li&gt;
 
-  <span class="removed"><del><strong>&lt;li&gt;
-    &lt;p&gt;Microsoft has made</strong></del></span>
-
-  <span class="inserted"><ins><em>&lt;li id="M201606270"&gt;
-    &lt;p id="windows10-forcing"&gt;In its efforts to trick users 
of</em></ins></span> Windows
-    7 and 8 <span class="removed"><del><strong>cease to function on certain
-      new computers,
-      &lt;a 
href="https://support.microsoft.com/en-us/help/4012982/discusses-an-issue-in-which-you-receive-a-your-pc-uses-a-processor-tha"&gt;effectively
-      forcing</strong></del></span> <span class="inserted"><ins><em>into 
installing all-spying Windows 10 against</em></ins></span> their <span 
class="removed"><del><strong>owners to switch</strong></del></span>
-    <span class="inserted"><ins><em>will, Microsoft forced their 
computers</em></ins></span> to <span class="inserted"><ins><em>&lt;a
+  &lt;li id="M201606270"&gt;
+    &lt;p id="windows10-forcing"&gt;In its efforts to trick users of Windows
+    7 and 8 into installing all-spying Windows 10 against their
+    will,</em></ins></span> Microsoft <span 
class="removed"><del><strong>does</strong></del></span> <span 
class="inserted"><ins><em>forced their computers to &lt;a
     
href="https://www.theguardian.com/technology/2015/sep/11/microsoft-downloading-windows-1"&gt;
-    silently download&hellip; the whole of</em></ins></span> Windows <span 
class="removed"><del><strong>10&lt;/a&gt;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>10&lt;/a&gt;! Apparently,
-    this was done through a &lt;a
+    silently download&hellip; the whole of Windows 10&lt;/a&gt;! 
Apparently,</em></ins></span>
+    this <span class="removed"><del><strong>after having
+  made</strong></del></span> <span class="inserted"><ins><em>was done through 
a &lt;a
     href="/proprietary/proprietary-back-doors.html#windows-update"&gt;
-    universal back door&lt;/a&gt;. Not only did the unwanted downloads &lt;a
+    universal back door&lt;/a&gt;. Not only did</em></ins></span> the <span 
class="removed"><del><strong>users dependent on Microsoft, 
because</strong></del></span> <span class="inserted"><ins><em>unwanted 
downloads &lt;a
     
href="https://www.theregister.co.uk/2016/06/03/windows_10_upgrade_satellite_link/"&gt;
     use up much needed resources&lt;/a&gt;, but many of the people who let
     installation proceed found out that this &ldquo;upgrade&rdquo; was in fact 
a &lt;a
     
href="http://gizmodo.com/woman-wins-10-000-from-microsoft-after-unwanted-window-1782666146"&gt;
-    downgrade&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
+    downgrade&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;
 
-  <span 
class="removed"><del><strong>&lt;li&gt;&lt;p&gt;Once</strong></del></span>
-
-  <span class="inserted"><ins><em>&lt;li id="M201606010"&gt;
-    &lt;p&gt;Once</em></ins></span> Microsoft has tricked a user
-    into accepting installation of Windows 10, &lt;a <span 
class="removed"><del><strong>href="http://www.theregister.co.uk/2016/06/01/windows_10_nagware_no_way_out/"&gt;they</strong></del></span>
-    <span 
class="inserted"><ins><em>href="https://www.theregister.co.uk/2016/06/01/windows_10_nagware_no_way_out/"&gt;they</em></ins></span>
-    find that they are denied the option to cancel or even postpone the
-    imposed date of <span class="removed"><del><strong>installation&lt;/a&gt;.
-   &lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>installation&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
+  &lt;li id="M201606010"&gt;
+    &lt;p&gt;Once Microsoft has tricked a user
+    into accepting installation of Windows 10, &lt;a
+    
href="https://www.theregister.co.uk/2016/06/01/windows_10_nagware_no_way_out/"&gt;they
+    find that</em></ins></span> they are <span 
class="removed"><del><strong>not free to ask
+  anyone else</strong></del></span> <span class="inserted"><ins><em>denied the 
option</em></ins></span> to <span class="removed"><del><strong>work 
on</strong></del></span> <span class="inserted"><ins><em>cancel or even 
postpone</em></ins></span> the <span 
class="removed"><del><strong>program</strong></del></span>
+    <span class="inserted"><ins><em>imposed date of 
installation&lt;/a&gt;.&lt;/p&gt;
 
-    &lt;p&gt;This demonstrates what we've said for years: using proprietary
-    software means letting someone <span class="removed"><del><strong>have 
power over you, and you're
-   going to get screwed sooner or later.&lt;/p&gt;&lt;/li&gt;
+    &lt;p&gt;This demonstrates what we've said</em></ins></span> for <span 
class="removed"><del><strong>them.&lt;/p&gt;&lt;/li&gt;
+&lt;/ul&gt;
 
-  &lt;li&gt;&lt;p&gt;Microsoft
-  has &lt;a 
href="http://www.theverge.com/2016/1/16/10780876/microsoft-windows-support-policy-new-processors-skylake"&gt;desupported
-  all future Intel CPUs for Windows 7 and 8&lt;/a&gt;. Those machines will
-  be stuck with the nastier Windows 10.
-  &lt;a 
href="http://gizmodo.com/only-the-latest-version-of-windows-will-run-on-some-fut-1753545825"&gt;
-  AMD and Qualcomm CPUs, too&lt;/a&gt;.
-  &lt;/p&gt;
-  &lt;p&gt;Of course, Windows 7 and 8 are unethical too, because they are
-  proprietary software.  But this example of Microsoft's wielding its
-  power demonstrates the power it holds.
-  &lt;/p&gt;
-  &lt;p&gt;Free software developers also stop maintaining old versions of
-  their programs, but this is not unfair to users because the
-  users of free software have control over it.  If it is important
-  enough to you, you and other users can hire someone to support
-  the old version on your future platforms.
-  &lt;/p&gt;&lt;/li&gt;
+&lt;h3 id="interference"&gt;Microsoft Interference&lt;/h3&gt;
 
-  &lt;li&gt;&lt;p&gt;Microsoft
-    is &lt;a 
href="http://gizmodo.com/woman-wins-10-000-from-microsoft-after-unwanted-window-1782666146"&gt;
-    forcibly pushing Windows
-    update</strong></del></span> <span class="inserted"><ins><em>have power 
over you, and you're going</em></ins></span>
-    to <span class="removed"><del><strong>its version 10&lt;/a&gt;, ignoring 
the flag on Windows 7</strong></del></span> <span class="inserted"><ins><em>get 
screwed sooner</em></ins></span> or <span class="removed"><del><strong>8
-    that you could set</strong></del></span> <span 
class="inserted"><ins><em>later.&lt;/p&gt;
+&lt;p&gt;Various</strong></del></span> <span class="inserted"><ins><em>years: 
using</em></ins></span> proprietary <span class="removed"><del><strong>programs 
often mess up the user's system. They are like sabotage, but they are not grave 
enough</strong></del></span>
+    <span class="inserted"><ins><em>software means letting someone have power 
over you, and you're going</em></ins></span>
+    to <span class="removed"><del><strong>qualify</strong></del></span> <span 
class="inserted"><ins><em>get screwed sooner or later.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201601310"&gt;
-    &lt;p&gt;FTDI's proprietary driver
-    for its USB-to-serial chips has been designed</em></ins></span> to <span 
class="removed"><del><strong>not upgrade.  This reaffirms the presence of
-    a</strong></del></span> &lt;a <span 
class="removed"><del><strong>href="/proprietary/proprietary-back-doors.html"&gt;universal
-    back door in Windows&lt;/a&gt; 7 and 8.&lt;/p&gt;&lt;/li&gt;
-
-  &lt;li&gt;&lt;p&gt;Windows</strong></del></span>
-    <span 
class="inserted"><ins><em>href="http://arstechnica.com/information-technology/2014/10/windows-update-drivers-bricking-usb-serial-chips-beloved-of-hardware-hackers/"&gt;sabotage
+    &lt;p&gt;FTDI's proprietary driver</em></ins></span>
+    for <span class="removed"><del><strong>the word &ldquo;sabotage&rdquo;. 
Nonetheless,</strong></del></span> <span class="inserted"><ins><em>its 
USB-to-serial chips has been designed to &lt;a
+    
href="http://arstechnica.com/information-technology/2014/10/windows-update-drivers-bricking-usb-serial-chips-beloved-of-hardware-hackers/"&gt;sabotage
     alternative compatible chips&lt;/a&gt;
-    so that they no longer work. Microsoft is &lt;a
-    
href="http://it.slashdot.org/story/16/01/31/1720259/ftdi-driver-breaks-hardware-again"&gt;installing
+    so that</em></ins></span> they <span class="removed"><del><strong>are 
nasty and wrong. This section describes examples of</strong></del></span> <span 
class="inserted"><ins><em>no longer work.</em></ins></span> Microsoft <span 
class="removed"><del><strong>committing
+interference.&lt;/p&gt;
+
+&lt;ul&gt;
+  &lt;li&gt;&lt;p&gt;Microsoft</strong></del></span> is <span 
class="removed"><del><strong>planning to make Windows</strong></del></span> 
&lt;a
+      <span 
class="removed"><del><strong>href="https://www.theguardian.com/technology/2018/mar/19/windows-10-microsoft-force-people-edge-browser-windows-mail-chrome-firefox"&gt;
+      impose use of its browser, Edge, in certain 
circumstances&lt;/a&gt;.&lt;/p&gt;
+    &lt;p&gt;The reason Microsoft can force things on</strong></del></span>
+    <span 
class="inserted"><ins><em>href="http://it.slashdot.org/story/16/01/31/1720259/ftdi-driver-breaks-hardware-again"&gt;installing
     this automatically&lt;/a&gt; as an &ldquo;upgrade&rdquo;.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201511240"&gt;
-    &lt;p&gt;Windows</em></ins></span> 10 &ldquo;upgrades&rdquo; &lt;a
+    &lt;p&gt;Windows 10 &ldquo;upgrades&rdquo; &lt;a
     
href="http://www.ghacks.net/2015/11/24/beware-latest-windows-10-update-may-remove-programs-automatically/"&gt;
-    delete applications&lt;/a&gt; without asking <span 
class="removed"><del><strong>permission.&lt;/p&gt;&lt;/li&gt;
-
-  &lt;li&gt;&lt;p&gt;
-  Microsoft is &lt;a 
href="http://www.theguardian.com/technology/2015/sep/11/microsoft-downloading-windows-1"&gt;
-  repeatedly nagging many users to install Windows 10&lt;/a&gt;.
-  &lt;/p&gt;&lt;/li&gt;
-
-&lt;li&gt;&lt;p&gt;
-Microsoft was for months &lt;a
-href="http://www.theguardian.com/technology/2016/feb/02/microsoft-downloading-windows-10-automatic-update"&gt;
-tricking users into &ldquo;upgrading&rdquo; to Windows 10&lt;/a&gt;, if they
-failed to notice and say no.
-&lt;/p&gt;&lt;/li&gt;
-
-  &lt;li&gt;&lt;p&gt;&lt;a
-href="https://web.archive.org/web/20130622044225/http://blogs.computerworlduk.com/open-enterprise/2013/06/how-can-any-company-ever-trust-microsoft-again/index.htm"&gt;
-  Microsoft informs the NSA of bugs in Windows before fixing 
them.&lt;/a&gt;&lt;/p&gt;&lt;/li&gt;
-
-  &lt;li&gt;&lt;p&gt;&lt;a 
href="http://www.computerworlduk.com/blogs/open-enterprise/windows-xp-end-of-an-era-end-of-an-error-3569489/"&gt;
-  Microsoft</strong></del></span> <span 
class="inserted"><ins><em>permission.&lt;/p&gt;
+    delete applications&lt;/a&gt; without asking permission.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201503260"&gt;
     &lt;p&gt;&lt;a
-    
href="https://www.computerworlduk.com/it-business/windows-xp-end-of-an-era-end-of-an-error-3569489/"&gt;Microsoft</em></ins></span>
-    cut off security fixes for Windows XP, except to some big users that
-    pay <span 
class="removed"><del><strong>exorbitantly.&lt;/a&gt;&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>exorbitantly&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
-
-    &lt;p&gt;Microsoft is going to &lt;a <span 
class="removed"><del><strong>href="http://www.computerworlduk.com/news/security/3605515/more-than-half-of-all-ie-users-face-patch-axe-in-10-months/"&gt;</strong></del></span>
-    <span 
class="inserted"><ins><em>href="https://www.computerworlduk.com/applications/more-than-half-of-all-ie-users-face-patch-axe-in-10-months-3605515/"&gt;</em></ins></span>
-    cut off support for some Internet Explorer versions&lt;/a&gt; in the same
+    
href="https://www.computerworlduk.com/it-business/windows-xp-end-of-an-era-end-of-an-error-3569489/"&gt;Microsoft
+    cut off security fixes for Windows XP, except to some 
big</em></ins></span> users <span 
class="removed"><del><strong>is</strong></del></span> that <span 
class="removed"><del><strong>Windows</strong></del></span>
+    <span class="inserted"><ins><em>pay exorbitantly&lt;/a&gt;.&lt;/p&gt;
+
+    &lt;p&gt;Microsoft</em></ins></span> is
+      <span class="removed"><del><strong>nonfree.&lt;/p&gt;&lt;/li&gt;
+
+  &lt;li&gt;&lt;p&gt;Windows displays</strong></del></span> <span 
class="inserted"><ins><em>going to</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.theverge.com/2017/3/17/14956540/microsoft-windows-10-ads-taskbar-file-explorer"&gt;
+       intrusive ads</strong></del></span>
+    <span 
class="inserted"><ins><em>href="https://www.computerworlduk.com/applications/more-than-half-of-all-ie-users-face-patch-axe-in-10-months-3605515/"&gt;
+    cut off support</em></ins></span> for <span 
class="removed"><del><strong>Microsoft products and its
+       partners' products&lt;/a&gt;.&lt;/p&gt;
+    &lt;p&gt;The article's author starts from</strong></del></span> <span 
class="inserted"><ins><em>some Internet Explorer versions&lt;/a&gt; 
in</em></ins></span> the <span class="removed"><del><strong>premise that 
Microsoft</strong></del></span> <span class="inserted"><ins><em>same
     way.&lt;/p&gt;
 
-    &lt;p&gt;A person or company has the right to cease to work on a particular
-    program; the wrong here is Microsoft does this after having made the
-    users dependent on Microsoft, because they are not free to ask anyone
-    else to work on the program for <span 
class="removed"><del><strong>them.&lt;/p&gt;&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;h3 id="interference"&gt;Microsoft Interference&lt;/h3&gt;
-
-&lt;p&gt;Various proprietary programs often mess up the user's system. They 
are like sabotage, but they are not grave enough to qualify 
-for the word &ldquo;sabotage&rdquo;. Nonetheless, they are nasty and wrong. 
This section describes examples of Microsoft committing
-interference.&lt;/p&gt;
-
-&lt;ul&gt;
-  &lt;li&gt;&lt;p&gt;Microsoft is planning to make Windows &lt;a
-      
href="https://www.theguardian.com/technology/2018/mar/19/windows-10-microsoft-force-people-edge-browser-windows-mail-chrome-firefox"&gt;
-      impose use of its browser, Edge, in certain 
circumstances&lt;/a&gt;.&lt;/p&gt;
-    &lt;p&gt;The reason Microsoft can force things on users is that Windows is
-      nonfree.&lt;/p&gt;&lt;/li&gt;
-
-  &lt;li&gt;&lt;p&gt;Windows displays
-      &lt;a 
href="http://www.theverge.com/2017/3/17/14956540/microsoft-windows-10-ads-taskbar-file-explorer"&gt;
-       intrusive ads for Microsoft products and its
-       partners' products&lt;/a&gt;.&lt;/p&gt;
-    &lt;p&gt;The article's author starts from the premise that Microsoft
-      has a right to control what Windows does to users, as long as it
+    &lt;p&gt;A person or company</em></ins></span> has <span 
class="removed"><del><strong>a</strong></del></span> <span 
class="inserted"><ins><em>the</em></ins></span> right to <span 
class="removed"><del><strong>control what Windows does</strong></del></span> 
<span class="inserted"><ins><em>cease</em></ins></span> to <span 
class="removed"><del><strong>users, as long as it
       doesn't go &ldquo;too far&rdquo;. We disagree.&lt;/p&gt;&lt;/li&gt;
   
   &lt;li&gt;&lt;p&gt;Microsoft inserts &lt;a
 
href="https://www.theguardian.com/technology/2017/mar/10/windows-10-users-complain-new-microsoft-subscription-onedrive-adverts"&gt;
-      annoying advertisements inside of the File Explorer&lt;/a&gt; to nag
-      users to buy subscriptions for the OneDrive service.&lt;/p&gt;&lt;/li&gt;
+      annoying advertisements inside of</strong></del></span> <span 
class="inserted"><ins><em>work on a particular
+    program; the wrong here is Microsoft does this after having 
made</em></ins></span> the <span class="removed"><del><strong>File 
Explorer&lt;/a&gt; to nag</strong></del></span>
+    users <span class="inserted"><ins><em>dependent on Microsoft, because they 
are not free</em></ins></span> to <span class="removed"><del><strong>buy 
subscriptions</strong></del></span> <span class="inserted"><ins><em>ask anyone
+    else to work on the program</em></ins></span> for <span 
class="inserted"><ins><em>them.&lt;/p&gt;
+  &lt;/li&gt;
+
+  &lt;li id="M201306220"&gt;
+    &lt;p&gt;&lt;a
+    
href="https://web.archive.org/web/20130622044225/http://blogs.computerworlduk.com/open-enterprise/2013/06/how-can-any-company-ever-trust-microsoft-again/index.htm"&gt;Microsoft
+    informs</em></ins></span> the <span class="removed"><del><strong>OneDrive 
service.&lt;/p&gt;&lt;/li&gt;
 
-&lt;li&gt;In order to increase Windows 10's install base, Microsoft
+&lt;li&gt;In order to increase</strong></del></span> <span 
class="inserted"><ins><em>NSA of bugs in</em></ins></span> Windows <span 
class="removed"><del><strong>10's install base, Microsoft
 &lt;a
 
href="https://www.eff.org/deeplinks/2016/08/windows-10-microsoft-blatantly-disregards-user-choice-and-privacy-deep-dive"&gt;
-blatantly disregards user choice and privacy&lt;/a&gt;.</strong></del></span> 
<span class="inserted"><ins><em>them.&lt;/p&gt;</em></ins></span>
+blatantly disregards user choice and privacy&lt;/a&gt;.</strong></del></span> 
<span class="inserted"><ins><em>before fixing 
them&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
   &lt;/li&gt;
 
 <span class="removed"><del><strong>&lt;li&gt;&lt;p&gt;Microsoft has
-started &lt;a 
href="https://www.theguardian.com/technology/2016/jul/04/microsoft-windows-10-full-screen-upgrade-notification-pop-up-reminder"&gt;nagging
-users obnoxiously and repeatedly to install Windows 
10&lt;/a&gt;.&lt;/p&gt;&lt;/li&gt;
+started &lt;a 
href="https://www.theguardian.com/technology/2016/jul/04/microsoft-windows-10-full-screen-upgrade-notification-pop-up-reminder"&gt;nagging</strong></del></span>
+<span class="inserted"><ins><em>&lt;/ul&gt;
+
+
+&lt;h3 id="subscriptions"&gt;Microsoft Subscriptions&lt;/h3&gt;
+
+&lt;ul class="blurbs"&gt;
+&lt;!-- INSERT microsoft-subscript --&gt;
+  &lt;li id="M201507150"&gt;
+    &lt;p&gt;Microsoft Office forces</em></ins></span> users <span 
class="removed"><del><strong>obnoxiously and repeatedly to install Windows 
10&lt;/a&gt;.&lt;/p&gt;&lt;/li&gt;
 
   &lt;li&gt;&lt;p&gt;Microsoft
       &lt;a 
href="http://news.softpedia.com/news/windows-10-upgrade-reportedly-starting-automatically-on-windows-7-pcs-501651.shtml"&gt;is
@@ -516,23 +521,9 @@
 
   &lt;li&gt;&lt;p&gt;Microsoft has made companies' Windows machines managed by 
the
 company's
-sysadmins &lt;a 
href="http://www.infoworld.com/article/3042397/microsoft-windows/admins-beware-domain-attached-pcs-are-sprouting-get-windows-10-ads.html"&gt;harangue</strong></del></span>
-
-  <span class="inserted"><ins><em>&lt;li id="M201306220"&gt;
-    &lt;p&gt;&lt;a
-    
href="https://web.archive.org/web/20130622044225/http://blogs.computerworlduk.com/open-enterprise/2013/06/how-can-any-company-ever-trust-microsoft-again/index.htm"&gt;Microsoft
-    informs the NSA of bugs in Windows before fixing them&lt;/a&gt;.&lt;/p&gt;
-  &lt;/li&gt;
-&lt;/ul&gt;
-
-
-&lt;h3 id="subscriptions"&gt;Microsoft Subscriptions&lt;/h3&gt;
-
-&lt;ul class="blurbs"&gt;
-&lt;!-- INSERT subscriptions --&gt;
-  &lt;li id="M201507150"&gt;
-    &lt;p&gt;Microsoft Office forces</em></ins></span> users <span 
class="inserted"><ins><em>&lt;a
-    
href="https://www.computerworld.com/article/2948755/windows-apps/office-for-windows-10-will-require-office-365-subscription-on-pcs-larger-tablets.html"&gt;to
+sysadmins</strong></del></span> &lt;a <span 
class="removed"><del><strong>href="http://www.infoworld.com/article/3042397/microsoft-windows/admins-beware-domain-attached-pcs-are-sprouting-get-windows-10-ads.html"&gt;harangue
+users</strong></del></span>
+    <span 
class="inserted"><ins><em>href="https://www.computerworld.com/article/2948755/windows-apps/office-for-windows-10-will-require-office-365-subscription-on-pcs-larger-tablets.html"&gt;to
     subscribe</em></ins></span> to <span 
class="removed"><del><strong>complain</strong></del></span> <span 
class="inserted"><ins><em>Office 365</em></ins></span> to <span 
class="removed"><del><strong>the sysadmins about not 
&ldquo;upgrading&rdquo;</strong></del></span> <span 
class="inserted"><ins><em>be able</em></ins></span> to <span 
class="removed"><del><strong>Windows
 10&lt;/a&gt;.&lt;/p&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>create/edit documents&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;</em></ins></span>
@@ -630,11 +621,11 @@
     &lt;p&gt;&lt;a
     
href="http://arstechnica.com/information-technology/2015/08/even-when-told-not-to-windows-10-just-cant-stop-talking-to-microsoft/"&gt;</em></ins></span>
     Windows 10 <span class="removed"><del><strong>comes with 13 screens of 
snooping options&lt;/a&gt;, all enabled by default,
-  and turning them off would be daunting</strong></del></span> <span 
class="inserted"><ins><em>sends identifiable information</em></ins></span> to 
<span class="removed"><del><strong>most users.&lt;/p&gt;&lt;/li&gt;
+  and turning them</strong></del></span> <span class="inserted"><ins><em>sends 
identifiable information to Microsoft&lt;/a&gt;, even if
+    a user turns</em></ins></span> off <span 
class="removed"><del><strong>would be daunting to most 
users.&lt;/p&gt;&lt;/li&gt;
 
   &lt;li&gt;&lt;p&gt;
-  Windows</strong></del></span> <span 
class="inserted"><ins><em>Microsoft&lt;/a&gt;, even if
-    a user turns off its Bing search and Cortana features, and activates
+  Windows</strong></del></span> <span class="inserted"><ins><em>its Bing 
search and Cortana features, and activates
     the privacy-protection settings.&lt;/p&gt;
   &lt;/li&gt;
 
@@ -645,11 +636,12 @@
     its users&lt;/a&gt;, giving Microsoft the &ldquo;right&rdquo; to snoop on
     the users' files, text input, voice input, location info, contacts,
     calendar records and web browsing history, as well as automatically
-    connecting the machines to open hotspots and showing targeted <span 
class="removed"><del><strong>ads.&lt;/p&gt;
+    connecting the machines to open hotspots and showing targeted 
ads.&lt;/p&gt;
 
-  &lt;p&gt;We can suppose Microsoft look at users' files for the US government 
on
-  demand, though the &ldquo;privacy policy&rdquo; does not explicit say so. 
Will it
-  look at users' files for the Chinese government on 
demand?&lt;/p&gt;&lt;/li&gt;
+    &lt;p&gt;We can suppose Microsoft look at users' files for the US 
government
+    on demand, though the &ldquo;privacy policy&rdquo; does not <span 
class="removed"><del><strong>explicit</strong></del></span> <span 
class="inserted"><ins><em>explicitly</em></ins></span>
+    say so. Will it look at users' files for the Chinese government
+    on <span class="removed"><del><strong>demand?&lt;/p&gt;&lt;/li&gt;
 
   &lt;li&gt;&lt;p&gt;
   &lt;a 
href="http://arstechnica.com/information-technology/2015/08/even-when-told-not-to-windows-10-just-cant-stop-talking-to-microsoft/"&gt;
@@ -668,11 +660,8 @@
   secret NSA key in Windows&lt;/a&gt;, whose functions we don't 
know.&lt;/li&gt;
 
   &lt;li&gt;&lt;p&gt;
-  &lt;a 
href="http://www.itproportal.com/2014/05/14/microsoft-openly-offered-cloud-data-fbi-and-nsa/"&gt;</strong></del></span>
 <span class="inserted"><ins><em>ads.&lt;/p&gt;
-
-    &lt;p&gt;We can suppose</em></ins></span> Microsoft <span 
class="removed"><del><strong>SkyDrive allows</strong></del></span> <span 
class="inserted"><ins><em>look at users' files for</em></ins></span> the <span 
class="removed"><del><strong>NSA to directly examine</strong></del></span> 
<span class="inserted"><ins><em>US government
-    on demand, though the &ldquo;privacy policy&rdquo; does not explicitly
-    say so. Will it look at</em></ins></span> users' <span 
class="removed"><del><strong>data.&lt;/a&gt;&lt;/p&gt;
+  &lt;a 
href="http://www.itproportal.com/2014/05/14/microsoft-openly-offered-cloud-data-fbi-and-nsa/"&gt;
+  Microsoft SkyDrive allows the NSA to directly examine users' 
data.&lt;/a&gt;&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li&gt;&lt;p&gt;Spyware in Skype:
@@ -680,8 +669,7 @@
       
http://www.forbes.com/sites/petercohan/2013/06/20/project-chess-how-u-s-snoops-on-your-skype/&lt;/a&gt;.
       Microsoft changed Skype
       &lt;a 
href="http://www.guardian.co.uk/world/2013/jul/11/microsoft-nsa-collaboration-user-data"&gt;
-      specifically</strong></del></span> <span 
class="inserted"><ins><em>files</em></ins></span> for <span 
class="removed"><del><strong>spying&lt;/a&gt;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>the Chinese government
-    on demand?&lt;/p&gt;</em></ins></span>
+      specifically for spying&lt;/a&gt;.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>demand?&lt;/p&gt;</em></ins></span>
   &lt;/li&gt;
 
   <span class="removed"><del><strong>&lt;li&gt;&lt;p&gt;
@@ -714,25 +702,15 @@
 &lt;h3 id="drm"&gt;Microsoft DRM&lt;/h3&gt;
 &lt;ul&gt;
   &lt;li&gt;&lt;p&gt;&lt;a 
href="http://arstechnica.com/apple/2007/08/aacs-tentacles/"&gt;
-  DRM (digital restrictions mechanisms) in Windows&lt;/a&gt;, introduced to
-  cater to &lt;a 
href="/proprietary/proprietary-drm.html#bluray"&gt;Bluray&lt;/a&gt; disks.
-  (The article also talks about how the same malware would later be introduced
-  in MacOS.)&lt;/p&gt;&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;h3 id="jails"&gt;Microsoft Jails&lt;/h3&gt;
-&lt;ul&gt;
-  &lt;li&gt;
-    &lt;p&gt;Windows 10 S was a jail: &lt;a
-      
href="https://www.theguardian.com/technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison"&gt;</strong></del></span>
 <span class="inserted"><ins><em>now.&lt;/p&gt;
+  DRM (digital restrictions mechanisms) in Windows&lt;/a&gt;, 
introduced</strong></del></span> <span class="inserted"><ins><em>now.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201410040"&gt;
-    &lt;p&gt;It</em></ins></span> only <span 
class="removed"><del><strong>programs from the</strong></del></span> <span 
class="inserted"><ins><em>gets worse with time.  &lt;a
-    
href="http://www.techworm.net/2014/10/microsofts-windows-10-permission-watch-every-move.html"&gt;</em></ins></span>
-    Windows <span class="removed"><del><strong>Store could be 
installed</strong></del></span> <span class="inserted"><ins><em>10 requires 
users to give permission for total snooping&lt;/a&gt;,
-    including their files, their commands, their text input,</em></ins></span> 
and
-      <span class="removed"><del><strong>executed&lt;/a&gt;. It was however 
possible</strong></del></span> <span class="inserted"><ins><em>their
+    &lt;p&gt;It only gets worse with time.  &lt;a
+    
href="http://www.techworm.net/2014/10/microsofts-windows-10-permission-watch-every-move.html"&gt;
+    Windows 10 requires users</em></ins></span> to
+  <span class="removed"><del><strong>cater</strong></del></span> <span 
class="inserted"><ins><em>give permission for total snooping&lt;/a&gt;,
+    including their files, their commands, their text input, and their
     voice input.&lt;/p&gt;
   &lt;/li&gt;
 
@@ -744,10 +722,8 @@
   &lt;/li&gt;
 
   &lt;li id="M201307110"&gt;
-    &lt;p&gt;Skype contains</em></ins></span> &lt;a
-      <span 
class="removed"><del><strong>href="https://www.theverge.com/2017/6/13/15789998/microsoft-windows-10-s-upgrade-windows-10-pro-guide"&gt;
-      upgrade to Windows 10 Pro&lt;/a&gt;. The successor of Windows 10 S is a
-      special configuration</strong></del></span>
+    &lt;p&gt;Skype contains</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/proprietary/proprietary-drm.html#bluray"&gt;Bluray&lt;/a&gt;
 disks.
+  (The article also talks about how</strong></del></span>
     <span 
class="inserted"><ins><em>href="https://web.archive.org/web/20130928235637/http://www.forbes.com/sites/petercohan/2013/06/20/project-chess-how-u-s-snoops-on-your-skype/"&gt;spyware&lt;/a&gt;.
     Microsoft changed Skype &lt;a
     
href="http://www.guardian.co.uk/world/2013/jul/11/microsoft-nsa-collaboration-user-data"&gt;
@@ -755,20 +731,44 @@
   &lt;/li&gt;
 
   &lt;li id="M201307080"&gt;
-    &lt;p&gt;Spyware in older versions</em></ins></span> of <span 
class="removed"><del><strong>Windows 10 called</strong></del></span> <span 
class="inserted"><ins><em>Windows:</em></ins></span> &lt;a
-      <span 
class="removed"><del><strong>href="https://support.microsoft.com/en-gb/help/4020089/windows-10-in-s-mode-faq"&gt;
-      S mode&lt;/a&gt;. The major difference with</strong></del></span>
-    <span 
class="inserted"><ins><em>href="https://www.theregister.co.uk/2003/02/28/windows_update_keeps_tabs/"&gt;</em></ins></span>
-    Windows <span class="removed"><del><strong>10 S is that there
-      is an easy way to switch out of S mode.&lt;/p&gt;&lt;/li&gt;
-
-  &lt;li&gt;
-    &lt;p&gt;&lt;a 
href="http://www.itworld.com/article/2832657/operating-systems/microsoft-metro-app-store-lock-down.html"&gt;</strong></del></span>
 <span class="inserted"><ins><em>Update snoops on the user&lt;/a&gt;. &lt;a
-    
href="https://www.infoworld.com/article/2611451/microsoft-windows/a-look-at-the-black-underbelly-of-windows-8-1--blue-.html"&gt;</em></ins></span>
-    Windows <span class="removed"><del><strong>8</strong></del></span> <span 
class="inserted"><ins><em>8.1 snoops</em></ins></span> on <span 
class="removed"><del><strong>&ldquo;mobile devices&rdquo; (now defunct) 
was</strong></del></span> <span class="inserted"><ins><em>local 
searches&lt;/a&gt;. And there's</em></ins></span> a
-      <span 
class="removed"><del><strong>jail&lt;/a&gt;.&lt;/p&gt;&lt;/li&gt;</strong></del></span>
 <span class="inserted"><ins><em>&lt;a
+    &lt;p&gt;Spyware in older versions of Windows: &lt;a
+    
href="https://www.theregister.co.uk/2003/02/28/windows_update_keeps_tabs/"&gt;
+    Windows Update snoops on</em></ins></span> the <span 
class="removed"><del><strong>same malware would later be 
introduced</strong></del></span> <span 
class="inserted"><ins><em>user&lt;/a&gt;. &lt;a
+    
href="https://www.infoworld.com/article/2611451/microsoft-windows/a-look-at-the-black-underbelly-of-windows-8-1--blue-.html"&gt;
+    Windows 8.1 snoops on local searches&lt;/a&gt;. And there's a &lt;a
     href="http://www.marketoracle.co.uk/Article40836.html"&gt; secret NSA
-    key in Windows&lt;/a&gt;, whose functions we don't know.&lt;/p&gt;
+    key</em></ins></span> in <span 
class="removed"><del><strong>MacOS.)&lt;/p&gt;&lt;/li&gt;</strong></del></span> 
<span class="inserted"><ins><em>Windows&lt;/a&gt;, whose functions we don't 
know.&lt;/p&gt;
+  &lt;/li&gt;</em></ins></span>
+&lt;/ul&gt;
+
+
+&lt;h3 id="jails"&gt;Microsoft Jails&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;ul&gt;
+  &lt;li&gt;</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;ul class="blurbs"&gt;
+&lt;!-- INSERT microsoft-jail --&gt;
+  &lt;li id="M201706130"&gt;</em></ins></span>
+    &lt;p&gt;Windows 10 S was a jail: &lt;a
+    
href="https://www.theguardian.com/technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison"&gt;
+    only programs from the Windows Store could be
+    installed and executed&lt;/a&gt;. It was however possible to &lt;a
+    
href="https://www.theverge.com/2017/6/13/15789998/microsoft-windows-10-s-upgrade-windows-10-pro-guide"&gt;
+    upgrade to Windows 10 Pro&lt;/a&gt;. The successor of Windows
+    10 S is a special configuration of Windows 10 called &lt;a
+    
href="https://support.microsoft.com/en-gb/help/4020089/windows-10-in-s-mode-faq"&gt;
+    S mode&lt;/a&gt;. The major difference with Windows 10 S is that there is
+    an easy way to switch out of S <span 
class="removed"><del><strong>mode.&lt;/p&gt;&lt;/li&gt;
+
+  &lt;li&gt;</strong></del></span> <span 
class="inserted"><ins><em>mode.&lt;/p&gt;
+  &lt;/li&gt;
+
+  &lt;li id="M201210080"&gt;</em></ins></span>
+    &lt;p&gt;&lt;a
+    
href="http://www.itworld.com/article/2832657/operating-systems/microsoft-metro-app-store-lock-down.html"&gt;
+    Windows 8 on &ldquo;mobile devices&rdquo; (now defunct) was a
+      <span 
class="removed"><del><strong>jail&lt;/a&gt;.&lt;/p&gt;&lt;/li&gt;</strong></del></span>
+    <span class="inserted"><ins><em>jail&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;</em></ins></span>
 &lt;/ul&gt;
 
@@ -778,7 +778,7 @@
 &lt;li&gt;</strong></del></span>
 
 <span class="inserted"><ins><em>&lt;ul class="blurbs"&gt;
-&lt;!-- INSERT tyrants --&gt;
+&lt;!-- INSERT microsoft-tyrant --&gt;
   &lt;li id="M201607150"&gt;</em></ins></span>
     &lt;p&gt;Microsoft accidentally left a way for users
     to install GNU/Linux on Windows RT tablets, but now it has &lt;a
@@ -870,7 +870,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2018/10/05 17:29:55 $
+$Date: 2018/10/07 19:58:31 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: malware-microsoft.de.po
===================================================================
RCS file: /web/www/www/proprietary/po/malware-microsoft.de.po,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- malware-microsoft.de.po     5 Oct 2018 17:29:55 -0000       1.122
+++ malware-microsoft.de.po     7 Oct 2018 19:58:31 -0000       1.123
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: malware-microsoft.html\n"
 "Report-Msgid-Bugs-To: Webmasters <address@hidden>\n"
-"POT-Creation-Date: 2018-10-05 17:25+0000\n"
+"POT-Creation-Date: 2018-10-07 19:56+0000\n"
 "PO-Revision-Date: 2018-07-20 22:00+0200\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: German <address@hidden>\n"
@@ -75,7 +75,7 @@
 "machtlos sein würden bösartige Funktionen zu beheben, den Entwickler dazu "
 "verführt einige aufzuerlegen."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 # || No change detected.  The change might only be in amounts of spaces.
 #, fuzzy
 #| msgid ""
@@ -265,6 +265,16 @@
 "</a>"
 
 #. type: Content of: <ul><li><p>
+msgid ""
+"Here is a suspicion that we can't prove, but is worth thinking about: <a "
+"href=\"https://web.archive.org/web/20150206003913/http://www.afr.com/p/";
+"technology/intel_chips_could_be_nsa_key_to_ymrhS1HS1633gCWKt5tFtI\"> "
+"Writable microcode for Intel and AMD microprocessors</a> may be a vehicle "
+"for the NSA to invade computers, with the help of Microsoft, say respected "
+"security experts."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
 # | [-<a
 # | 
href=\"http://www.computerworld.com/article/2500036/desktop-apps/microsoft--we-can-remotely-delete-windows-8-apps.html\";>-]Windows
 # | 8 also has a back door for {+<a
@@ -572,47 +582,6 @@
 "unterstützbar zu machen."
 
 #. type: Content of: <h3>
-msgid "Microsoft Jails"
-msgstr "Gefängnisse"
-
-#. type: Content of: <ul><li><p>
-msgid ""
-"Windows 10 S was a jail: <a href=\"https://www.theguardian.com/";
-"technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\"> only "
-"programs from the Windows Store could be installed and executed</a>. It was "
-"however possible to <a href=\"https://www.theverge.com/2017/6/13/15789998/";
-"microsoft-windows-10-s-upgrade-windows-10-pro-guide\"> upgrade to Windows 10 "
-"Pro</a>. The successor of Windows 10 S is a special configuration of Windows "
-"10 called <a href=\"https://support.microsoft.com/en-gb/help/4020089/";
-"windows-10-in-s-mode-faq\"> S mode</a>. The major difference with Windows 10 "
-"S is that there is an easy way to switch out of S mode."
-msgstr ""
-"Windows 10 S: <a href=\"https://www.theguardian.com/technology/2017/may/03/";
-"windows-10-s-microsoft-faster-pc-comparison\" title=\"What is Windows 10 S "
-"and how is it different from regular Windows 10?, Guardian News and Media "
-"Limited or its affiliated companies 2018.\">Programme nur aus Windows Store "
-"installier- und ausführbar</a>. Eine <a href=\"https://www.theverge.";
-"com/2017/6/13/15789998/microsoft-windows-10-s-upgrade-windows-10-pro-guide\" "
-"title=\"How to upgrade from Windows 10 S to Windows 10 Pro, Vox Media 2018."
-"\">Aktualisierung auf Windows 10 Pro </a> war jedoch möglich. Nachfolger ist 
"
-"eine spezielle Konfiguration von Windows 10 namens <a href=\"https://support.";
-"microsoft.com/de-de/help/4020089/windows-10-in-s-mode-faq\" title=\"Windows "
-"10 im S Modus - Häufig gestellte Fragen, Microsoft 2018 (Stand: 2018-05-09)."
-"\">S Modus</a>. Hauptunterschied zu Windows 10 S ist eine einfache "
-"Möglichkeit, den S-Modus auszuschalten."
-
-#. type: Content of: <ul><li><p>
-msgid ""
-"<a href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-";
-"metro-app-store-lock-down.html\"> Windows 8 on &ldquo;mobile devices&rdquo; "
-"(now defunct) was a jail</a>."
-msgstr ""
-"<a href=\"https://www.itworld.com/article/2832657/operating-systems/";
-"microsoft-metro-app-store-lock-down.html\" title=\"Microsoft Metro app store "
-"lock down, IDG Communications 2018.\">Windows&#160;8 auf „Mobilgeräten“ "
-"<em>war</em> ein Gefängnis.</a>"
-
-#. type: Content of: <h3>
 msgid "Microsoft Sabotage"
 msgstr "Sabotage"
 
@@ -1250,6 +1219,47 @@
 "nicht kennen."
 
 #. type: Content of: <h3>
+msgid "Microsoft Jails"
+msgstr "Gefängnisse"
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"Windows 10 S was a jail: <a href=\"https://www.theguardian.com/";
+"technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\"> only "
+"programs from the Windows Store could be installed and executed</a>. It was "
+"however possible to <a href=\"https://www.theverge.com/2017/6/13/15789998/";
+"microsoft-windows-10-s-upgrade-windows-10-pro-guide\"> upgrade to Windows 10 "
+"Pro</a>. The successor of Windows 10 S is a special configuration of Windows "
+"10 called <a href=\"https://support.microsoft.com/en-gb/help/4020089/";
+"windows-10-in-s-mode-faq\"> S mode</a>. The major difference with Windows 10 "
+"S is that there is an easy way to switch out of S mode."
+msgstr ""
+"Windows 10 S: <a href=\"https://www.theguardian.com/technology/2017/may/03/";
+"windows-10-s-microsoft-faster-pc-comparison\" title=\"What is Windows 10 S "
+"and how is it different from regular Windows 10?, Guardian News and Media "
+"Limited or its affiliated companies 2018.\">Programme nur aus Windows Store "
+"installier- und ausführbar</a>. Eine <a href=\"https://www.theverge.";
+"com/2017/6/13/15789998/microsoft-windows-10-s-upgrade-windows-10-pro-guide\" "
+"title=\"How to upgrade from Windows 10 S to Windows 10 Pro, Vox Media 2018."
+"\">Aktualisierung auf Windows 10 Pro </a> war jedoch möglich. Nachfolger ist 
"
+"eine spezielle Konfiguration von Windows 10 namens <a href=\"https://support.";
+"microsoft.com/de-de/help/4020089/windows-10-in-s-mode-faq\" title=\"Windows "
+"10 im S Modus - Häufig gestellte Fragen, Microsoft 2018 (Stand: 2018-05-09)."
+"\">S Modus</a>. Hauptunterschied zu Windows 10 S ist eine einfache "
+"Möglichkeit, den S-Modus auszuschalten."
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"<a href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-";
+"metro-app-store-lock-down.html\"> Windows 8 on &ldquo;mobile devices&rdquo; "
+"(now defunct) was a jail</a>."
+msgstr ""
+"<a href=\"https://www.itworld.com/article/2832657/operating-systems/";
+"microsoft-metro-app-store-lock-down.html\" title=\"Microsoft Metro app store "
+"lock down, IDG Communications 2018.\">Windows&#160;8 auf „Mobilgeräten“ "
+"<em>war</em> ein Gefängnis.</a>"
+
+#. type: Content of: <h3>
 msgid "Microsoft Tyrants"
 msgstr "Tyrannen"
 

Index: malware-microsoft.es.po
===================================================================
RCS file: /web/www/www/proprietary/po/malware-microsoft.es.po,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- malware-microsoft.es.po     5 Oct 2018 17:29:55 -0000       1.119
+++ malware-microsoft.es.po     7 Oct 2018 19:58:31 -0000       1.120
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: malware-microsoft.html\n"
-"POT-Creation-Date: 2018-10-05 17:25+0000\n"
+"POT-Creation-Date: 2018-10-07 19:56+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Javier Fdez. Retenaga <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -71,7 +71,7 @@
 "la posibilidad de poner remedio a las funcionalidades maliciosas, se ve "
 "tentado a imponer algunas."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "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"
@@ -240,6 +240,16 @@
 "creación de puertas traseras</a>."
 
 #. type: Content of: <ul><li><p>
+msgid ""
+"Here is a suspicion that we can't prove, but is worth thinking about: <a "
+"href=\"https://web.archive.org/web/20150206003913/http://www.afr.com/p/";
+"technology/intel_chips_could_be_nsa_key_to_ymrhS1HS1633gCWKt5tFtI\"> "
+"Writable microcode for Intel and AMD microprocessors</a> may be a vehicle "
+"for the NSA to invade computers, with the help of Microsoft, say respected "
+"security experts."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
 # | [-<a
 # | 
href=\"http://www.computerworld.com/article/2500036/desktop-apps/microsoft--we-can-remotely-delete-windows-8-apps.html\";>-]Windows
 # | 8 also has a back door for {+<a
@@ -536,43 +546,6 @@
 "plataformas."
 
 #. type: Content of: <h3>
-msgid "Microsoft Jails"
-msgstr "Prisiones de Microsoft"
-
-#. type: Content of: <ul><li><p>
-msgid ""
-"Windows 10 S was a jail: <a href=\"https://www.theguardian.com/";
-"technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\"> only "
-"programs from the Windows Store could be installed and executed</a>. It was "
-"however possible to <a href=\"https://www.theverge.com/2017/6/13/15789998/";
-"microsoft-windows-10-s-upgrade-windows-10-pro-guide\"> upgrade to Windows 10 "
-"Pro</a>. The successor of Windows 10 S is a special configuration of Windows "
-"10 called <a href=\"https://support.microsoft.com/en-gb/help/4020089/";
-"windows-10-in-s-mode-faq\"> S mode</a>. The major difference with Windows 10 "
-"S is that there is an easy way to switch out of S mode."
-msgstr ""
-"Windows 10 S era una prisión: <a href=\"https://www.theguardian.com/";
-"technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\"> solo "
-"se podían instalar y ejecutar programas procedentes de la Windows Store</a>. 
"
-"No obstante, era posible <a href=\"https://www.theverge.";
-"com/2017/6/13/15789998/microsoft-windows-10-s-upgrade-windows-10-pro-guide"
-"\">actualizar a Windows 10 Pro</a>. El sucesor de Windows 10 S es una "
-"configuración especial de Windows 10 llamada <a href=\"https://support.";
-"microsoft.com/en-gb/help/4020089/windows-10-in-s-mode-faq\"> modo S</a>. La "
-"principal diferencia con Windows 10 S es que existe una manera sencilla de "
-"salir del modo S."
-
-#. type: Content of: <ul><li><p>
-msgid ""
-"<a href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-";
-"metro-app-store-lock-down.html\"> Windows 8 on &ldquo;mobile devices&rdquo; "
-"(now defunct) was a jail</a>."
-msgstr ""
-"<a href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-";
-"metro-app-store-lock-down.html\">Windows 8 para «dispositivos móviles» (ya 
"
-"desaparecido) era una prisión</a>."
-
-#. type: Content of: <h3>
 msgid "Microsoft Sabotage"
 msgstr "Sabotaje de Microsoft"
 
@@ -1173,6 +1146,43 @@
 "funciones desconocemos."
 
 #. type: Content of: <h3>
+msgid "Microsoft Jails"
+msgstr "Prisiones de Microsoft"
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"Windows 10 S was a jail: <a href=\"https://www.theguardian.com/";
+"technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\"> only "
+"programs from the Windows Store could be installed and executed</a>. It was "
+"however possible to <a href=\"https://www.theverge.com/2017/6/13/15789998/";
+"microsoft-windows-10-s-upgrade-windows-10-pro-guide\"> upgrade to Windows 10 "
+"Pro</a>. The successor of Windows 10 S is a special configuration of Windows "
+"10 called <a href=\"https://support.microsoft.com/en-gb/help/4020089/";
+"windows-10-in-s-mode-faq\"> S mode</a>. The major difference with Windows 10 "
+"S is that there is an easy way to switch out of S mode."
+msgstr ""
+"Windows 10 S era una prisión: <a href=\"https://www.theguardian.com/";
+"technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\"> solo "
+"se podían instalar y ejecutar programas procedentes de la Windows Store</a>. 
"
+"No obstante, era posible <a href=\"https://www.theverge.";
+"com/2017/6/13/15789998/microsoft-windows-10-s-upgrade-windows-10-pro-guide"
+"\">actualizar a Windows 10 Pro</a>. El sucesor de Windows 10 S es una "
+"configuración especial de Windows 10 llamada <a href=\"https://support.";
+"microsoft.com/en-gb/help/4020089/windows-10-in-s-mode-faq\"> modo S</a>. La "
+"principal diferencia con Windows 10 S es que existe una manera sencilla de "
+"salir del modo S."
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"<a href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-";
+"metro-app-store-lock-down.html\"> Windows 8 on &ldquo;mobile devices&rdquo; "
+"(now defunct) was a jail</a>."
+msgstr ""
+"<a href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-";
+"metro-app-store-lock-down.html\">Windows 8 para «dispositivos móviles» (ya 
"
+"desaparecido) era una prisión</a>."
+
+#. type: Content of: <h3>
 msgid "Microsoft Tyrants"
 msgstr "Tiranos de Microsoft"
 

Index: malware-microsoft.fr.po
===================================================================
RCS file: /web/www/www/proprietary/po/malware-microsoft.fr.po,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -b -r1.134 -r1.135
--- malware-microsoft.fr.po     5 Oct 2018 18:50:47 -0000       1.134
+++ malware-microsoft.fr.po     7 Oct 2018 19:58:31 -0000       1.135
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: malware-microsoft.html\n"
-"POT-Creation-Date: 2018-10-05 17:25+0000\n"
+"POT-Creation-Date: 2018-10-07 19:56+0000\n"
 "PO-Revision-Date: 2018-10-05 18:44+0200\n"
 "Last-Translator: Thérèse Godefroy <godef.th AT free.fr>\n"
 "Language-Team: French <address@hidden>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2018-10-07 19:56+0000\n"
 "X-Generator: Gtranslator 2.91.5\n"
 "Plural-Forms: \n"
 
@@ -69,7 +70,7 @@
 "les utilisateurs seraient incapables de corriger une éventuelle "
 "fonctionnalité malveillante, est tenté de leur en imposer quelques-unes."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "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"
@@ -204,6 +205,16 @@
 
 #. type: Content of: <ul><li><p>
 msgid ""
+"Here is a suspicion that we can't prove, but is worth thinking about: <a "
+"href=\"https://web.archive.org/web/20150206003913/http://www.afr.com/p/";
+"technology/intel_chips_could_be_nsa_key_to_ymrhS1HS1633gCWKt5tFtI\"> "
+"Writable microcode for Intel and AMD microprocessors</a> may be a vehicle "
+"for the NSA to invade computers, with the help of Microsoft, say respected "
+"security experts."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
+msgid ""
 "Windows 8 also has a back door for <a href=\"http://www.computerworld.com/";
 "article/2500036/desktop-apps/microsoft--we-can-remotely-delete-windows-8-"
 "apps.html\"> remotely deleting apps</a>."
@@ -454,44 +465,6 @@
 "quelqu'un pour adapter l'ancienne version à vos futures plateformes."
 
 #. type: Content of: <h3>
-msgid "Microsoft Jails"
-msgstr "Prisons"
-
-#. type: Content of: <ul><li><p>
-msgid ""
-"Windows 10 S was a jail: <a href=\"https://www.theguardian.com/";
-"technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\"> only "
-"programs from the Windows Store could be installed and executed</a>. It was "
-"however possible to <a href=\"https://www.theverge.com/2017/6/13/15789998/";
-"microsoft-windows-10-s-upgrade-windows-10-pro-guide\"> upgrade to Windows 10 "
-"Pro</a>. The successor of Windows 10 S is a special configuration of Windows "
-"10 called <a href=\"https://support.microsoft.com/en-gb/help/4020089/";
-"windows-10-in-s-mode-faq\"> S mode</a>. The major difference with Windows 10 "
-"S is that there is an easy way to switch out of S mode."
-msgstr ""
-"Windows 10 S était une prison : <a href=\"https://www.theguardian.com/";
-"technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\">Seuls "
-"les programmes du magasin de Windows pouvaient être installés et 
exécutés</"
-"a>. Il était cependant possible de <a href=\"https://www.theverge.";
-"com/2017/6/13/15789998/microsoft-windows-10-s-upgrade-windows-10-pro-guide"
-"\">passer à Windows 10 Pro</a>. Le successur de Windows 10 S est une "
-"configuration spéciale de Windows 10 appelée <a href=\"https://support.";
-"microsoft.com/en-gb/help/4020089/windows-10-in-s-mode-faq\">mode S</a>. Sa "
-"différence principale avec Windows 10 est qu'on peut facilement sortir du "
-"mode S."
-
-#. type: Content of: <ul><li><p>
-msgid ""
-"<a href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-";
-"metro-app-store-lock-down.html\"> Windows 8 on &ldquo;mobile devices&rdquo; "
-"(now defunct) was a jail</a>."
-msgstr ""
-"<a href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-";
-"metro-app-store-lock-down.html\">Feu Windows 8 pour « appareils mobiles 
» "
-"était une prison</a> : il censurait le choix de l'utilisateur en matière 
de "
-"programmes d'application."
-
-#. type: Content of: <h3>
 msgid "Microsoft Sabotage"
 msgstr "Sabotage"
 
@@ -953,6 +926,44 @@
 "pas la fonction."
 
 #. type: Content of: <h3>
+msgid "Microsoft Jails"
+msgstr "Prisons"
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"Windows 10 S was a jail: <a href=\"https://www.theguardian.com/";
+"technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\"> only "
+"programs from the Windows Store could be installed and executed</a>. It was "
+"however possible to <a href=\"https://www.theverge.com/2017/6/13/15789998/";
+"microsoft-windows-10-s-upgrade-windows-10-pro-guide\"> upgrade to Windows 10 "
+"Pro</a>. The successor of Windows 10 S is a special configuration of Windows "
+"10 called <a href=\"https://support.microsoft.com/en-gb/help/4020089/";
+"windows-10-in-s-mode-faq\"> S mode</a>. The major difference with Windows 10 "
+"S is that there is an easy way to switch out of S mode."
+msgstr ""
+"Windows 10 S était une prison : <a href=\"https://www.theguardian.com/";
+"technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\">Seuls "
+"les programmes du magasin de Windows pouvaient être installés et 
exécutés</"
+"a>. Il était cependant possible de <a href=\"https://www.theverge.";
+"com/2017/6/13/15789998/microsoft-windows-10-s-upgrade-windows-10-pro-guide"
+"\">passer à Windows 10 Pro</a>. Le successur de Windows 10 S est une "
+"configuration spéciale de Windows 10 appelée <a href=\"https://support.";
+"microsoft.com/en-gb/help/4020089/windows-10-in-s-mode-faq\">mode S</a>. Sa "
+"différence principale avec Windows 10 est qu'on peut facilement sortir du "
+"mode S."
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"<a href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-";
+"metro-app-store-lock-down.html\"> Windows 8 on &ldquo;mobile devices&rdquo; "
+"(now defunct) was a jail</a>."
+msgstr ""
+"<a href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-";
+"metro-app-store-lock-down.html\">Feu Windows 8 pour « appareils mobiles 
» "
+"était une prison</a> : il censurait le choix de l'utilisateur en matière 
de "
+"programmes d'application."
+
+#. type: Content of: <h3>
 msgid "Microsoft Tyrants"
 msgstr "Tyrans"
 

Index: malware-microsoft.it-diff.html
===================================================================
RCS file: /web/www/www/proprietary/po/malware-microsoft.it-diff.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- malware-microsoft.it-diff.html      5 Oct 2018 17:29:55 -0000       1.11
+++ malware-microsoft.it-diff.html      7 Oct 2018 19:58:31 -0000       1.12
@@ -27,7 +27,7 @@
 &lt;p&gt;&lt;a href="/proprietary/proprietary.html"&gt;Other examples of 
proprietary
 malware&lt;/a&gt;&lt;/p&gt;
 
-&lt;div class="highlight-para"&gt;
+&lt;div <span 
class="removed"><del><strong>class="highlight-para"&gt;</strong></del></span> 
<span class="inserted"><ins><em>class="comment"&gt;</em></ins></span>
 &lt;p&gt;
 &lt;em&gt;Malware&lt;/em&gt; means software designed to function in ways that
 mistreat or harm the user.  (This does not include accidental errors.)
@@ -45,15 +45,18 @@
 because the developer's awareness that the users would be powerless to fix
 any malicious functionalities tempts the developer to impose some.
 &lt;/p&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
 
+&lt;div <span class="removed"><del><strong>class="summary" 
style="margin-top:</strong></del></span> <span 
class="inserted"><ins><em>class="important" 
style="margin-bottom:</em></ins></span> 2em"&gt;
 <span class="inserted"><ins><em>&lt;p&gt;If you know of an example that ought 
to be in this page but isn't
 here, please write
 to &lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;
 to inform us. Please include the URL of a trustworthy reference or two
-to present the specifics.&lt;/p&gt;</em></ins></span>
+to present the specifics.&lt;/p&gt;
+&lt;/div&gt;
 &lt;/div&gt;
 
-&lt;div class="summary" style="margin-top: 2em"&gt;
+&lt;div class="summary"&gt;</em></ins></span>
 &lt;h3&gt;Type&nbsp;of malware&lt;/h3&gt;
 &lt;ul&gt;
   &lt;li&gt;&lt;a href="#back-doors"&gt;Back doors&lt;/a&gt;&lt;/li&gt;
@@ -86,7 +89,7 @@
   &lt;li&gt;&lt;p&gt;Microsoft</strong></del></span>
 
 <span class="inserted"><ins><em>&lt;ul class="blurbs"&gt;
-&lt;!-- INSERT backdoor --&gt;
+&lt;!-- INSERT microsoft-back-door --&gt;
   &lt;li id="M201608172"&gt;
     &lt;p id="windows-update"&gt;Microsoft</em></ins></span>
     Windows has a universal back door through which &lt;a
@@ -124,6 +127,15 @@
     door capabilities of the TPM 2.0 chip.&lt;/p&gt;
   &lt;/li&gt;
 
+  &lt;li id="M201307300"&gt;
+    &lt;p&gt;Here is a suspicion that
+    we can't prove, but is worth thinking about: &lt;a
+    
href="https://web.archive.org/web/20150206003913/http://www.afr.com/p/technology/intel_chips_could_be_nsa_key_to_ymrhS1HS1633gCWKt5tFtI"&gt;
+    Writable microcode for Intel and AMD microprocessors&lt;/a&gt; may be a
+    vehicle for the NSA to invade computers, with the help of Microsoft,
+    say respected security experts.&lt;/p&gt;
+  &lt;/li&gt;
+
   &lt;li id="M201112081"&gt;
     &lt;p&gt;Windows 8</em></ins></span> also has a back door for <span 
class="inserted"><ins><em>&lt;a
     
href="http://www.computerworld.com/article/2500036/desktop-apps/microsoft--we-can-remotely-delete-windows-8-apps.html"&gt;</em></ins></span>
@@ -145,7 +157,7 @@
 &lt;h3 id="drm"&gt;Microsoft DRM&lt;/h3&gt;
 
 &lt;ul class="blurbs"&gt;
-&lt;!-- INSERT DRM --&gt;</em></ins></span>
+&lt;!-- INSERT microsoft-dr --&gt;</em></ins></span>
   &lt;li <span 
class="removed"><del><strong>id="windows7-back-door"&gt;&lt;p&gt;Users reported 
that &lt;a 
     
href="http://www.networkworld.com/article/2993490/windows/windows-10-upgrades-reportedly-appearing-as-mandatory-for-some-users.html#tk.rss_all"&gt;
     Microsoft was forcing them to replace Windows 7 and 8 with all-spying 
@@ -183,7 +195,7 @@
 &lt;li&gt;</strong></del></span>
 
 <span class="inserted"><ins><em>&lt;ul class="blurbs"&gt;
-&lt;!-- INSERT insecurity --&gt;
+&lt;!-- INSERT microsoft-insec --&gt;
   &lt;li id="M201705120"&gt;</em></ins></span>
     &lt;p&gt;Exploits of bugs in Windows, which were developed by the NSA
     and then leaked by the Shadowbrokers group, are now being used to &lt;a
@@ -210,20 +222,28 @@
     turned into a botnet for the purpose of collecting customers' credit
     card
 <span class="removed"><del><strong>numbers&lt;/a&gt;.
-&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>numbers.&lt;/p&gt;
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>numbers.&lt;/p&gt;</em></ins></span>
   &lt;/li&gt;
 &lt;/ul&gt;
 
 
-&lt;h3 id="interference"&gt;Microsoft Interference&lt;/h3&gt;
+&lt;h3 <span class="removed"><del><strong>id="sabotage"&gt;Microsoft 
Sabotage&lt;/h3&gt;
 
-&lt;p&gt;Various proprietary programs often mess up the user's system. They
-are like sabotage, but they are not grave enough to qualify for the word
+&lt;p&gt;The wrongs in this section are not precisely malware, since they do
+not involve making the program that runs in a way that 
hurts</strong></del></span> <span 
class="inserted"><ins><em>id="interference"&gt;Microsoft Interference&lt;/h3&gt;
+
+&lt;p&gt;Various proprietary programs often mess up</em></ins></span> the 
<span class="removed"><del><strong>user.
+But they</strong></del></span> <span class="inserted"><ins><em>user's system. 
They</em></ins></span>
+are <span class="removed"><del><strong>a lot</strong></del></span> like <span 
class="removed"><del><strong>malware, since</strong></del></span> <span 
class="inserted"><ins><em>sabotage, but</em></ins></span> they are <span 
class="removed"><del><strong>technical Microsoft
+actions that harm</strong></del></span> <span class="inserted"><ins><em>not 
grave enough</em></ins></span> to <span class="inserted"><ins><em>qualify 
for</em></ins></span> the <span 
class="removed"><del><strong>users</strong></del></span> <span 
class="inserted"><ins><em>word
 &ldquo;sabotage&rdquo;. Nonetheless, they are nasty and wrong. This
-section describes examples of Microsoft committing interference.&lt;/p&gt;
+section describes examples</em></ins></span> of <span 
class="removed"><del><strong>specific</strong></del></span> Microsoft <span 
class="removed"><del><strong>software.&lt;/p&gt;
+
+&lt;ul&gt;
+  &lt;li&gt;&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>committing interference.&lt;/p&gt;
 
 &lt;ul class="blurbs"&gt;
-&lt;!-- INSERT interference --&gt;
+&lt;!-- INSERT microsoft-interf --&gt;
   &lt;li id="M201809120"&gt;
     &lt;p&gt;One version of Windows 10 &lt;a
     
href="https://www.ghacks.net/2018/09/12/microsoft-intercepting-firefox-chrome-installation-on-windows-10/"&gt;
@@ -235,35 +255,51 @@
     
href="https://www.theguardian.com/technology/2018/mar/19/windows-10-microsoft-force-people-edge-browser-windows-mail-chrome-firefox"&gt;
     impose use of its browser, Edge, in certain 
circumstances&lt;/a&gt;.&lt;/p&gt;
 
-    &lt;p&gt;The reason Microsoft can force things on users is that Windows
+    &lt;p&gt;The reason</em></ins></span> Microsoft <span 
class="inserted"><ins><em>can force things on users is that Windows
     is nonfree.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201703170"&gt;
-    &lt;p&gt;Windows displays &lt;a
-    
href="http://www.theverge.com/2017/3/17/14956540/microsoft-windows-10-ads-taskbar-file-explorer"&gt;
-    intrusive ads for Microsoft products and its partners'
+    &lt;p&gt;Windows displays</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="https://arstechnica.com/information-technology/2017/04/new-processors-are-now-blocked-from-receiving-updates-on-old-windows/"&gt;
+       has dropped support</strong></del></span>
+    <span 
class="inserted"><ins><em>href="http://www.theverge.com/2017/3/17/14956540/microsoft-windows-10-ads-taskbar-file-explorer"&gt;
+    intrusive ads</em></ins></span> for <span 
class="removed"><del><strong>Windows 7</strong></del></span> <span 
class="inserted"><ins><em>Microsoft products</em></ins></span> and <span 
class="removed"><del><strong>8 on recent processors&lt;/a&gt;
+      in</strong></del></span> <span class="inserted"><ins><em>its partners'
     products&lt;/a&gt;.&lt;/p&gt;
 
-    &lt;p&gt;The article's author starts from the premise that Microsoft has
-    a right to control what Windows does to users, as long as it doesn't
-    go &ldquo;too far&rdquo;. We disagree.&lt;/p&gt;
+    &lt;p&gt;The article's author starts from the premise that Microsoft 
has</em></ins></span>
+    a <span class="removed"><del><strong>big hurry.&lt;/p&gt;
+    &lt;p&gt;It makes no difference</strong></del></span> <span 
class="inserted"><ins><em>right to control</em></ins></span> what <span 
class="removed"><del><strong>legitimate reasons Microsoft might
+      have for not doing work</strong></del></span> <span 
class="inserted"><ins><em>Windows does</em></ins></span> to <span 
class="removed"><del><strong>support them. If</strong></del></span> <span 
class="inserted"><ins><em>users, as long as</em></ins></span> it doesn't <span 
class="removed"><del><strong>want to
+      do this work, it should let users do the 
work.&lt;/p&gt;</strong></del></span>
+    <span class="inserted"><ins><em>go &ldquo;too far&rdquo;. We 
disagree.&lt;/p&gt;</em></ins></span>
   &lt;/li&gt;
 
-  &lt;li id="M201608170"&gt;
+  <span class="removed"><del><strong>&lt;li&gt;
+    &lt;p&gt;Microsoft has made</strong></del></span>
+
+  <span class="inserted"><ins><em>&lt;li id="M201608170"&gt;
     &lt;p&gt; After &lt;a 
href="/proprietary/malware-microsoft.html#windows10-forcing"&gt;forcing the 
download of Windows 10&lt;/a&gt;
-    on computers that were running Windows 7 and 8, Microsoft &lt;a
-    
href="http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html"&gt;
-    repeatedly switched on a flag that urged users to
-    &ldquo;upgrade&rdquo; to Windows 10&lt;/a&gt; when they had turned
-    it off, in the hope that some day they would fail to say no.
+    on computers that were running</em></ins></span> Windows 7 and <span 
class="removed"><del><strong>8 cease to function on certain
+      new computers,</strong></del></span> <span class="inserted"><ins><em>8, 
Microsoft</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="https://support.microsoft.com/en-us/help/4012982/discusses-an-issue-in-which-you-receive-a-your-pc-uses-a-processor-tha"&gt;effectively
+      forcing their owners</strong></del></span>
+    <span 
class="inserted"><ins><em>href="http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html"&gt;
+    repeatedly switched on a flag that urged users</em></ins></span> to <span 
class="removed"><del><strong>switch</strong></del></span>
+    <span class="inserted"><ins><em>&ldquo;upgrade&rdquo;</em></ins></span> to 
Windows <span class="removed"><del><strong>10&lt;/a&gt;.&lt;/p&gt;
+  &lt;/li&gt;
+
+  &lt;li&gt;&lt;p&gt;Once Microsoft has tricked a user into accepting 
installation
+   of Windows
+   10, &lt;a 
href="http://www.theregister.co.uk/2016/06/01/windows_10_nagware_no_way_out/"&gt;they
+   find</strong></del></span> <span class="inserted"><ins><em>10&lt;/a&gt; 
when they had turned
+    it off, in the hope</em></ins></span> that <span 
class="inserted"><ins><em>some day</em></ins></span> they <span 
class="removed"><del><strong>are denied</strong></del></span> <span 
class="inserted"><ins><em>would fail to say no.
     To do this, Microsoft used &lt;a
     
href="https://www.theregister.co.uk/2016/03/17/microsoft_windows_10_upgrade_gwx_vs_humanity/"&gt;
     malware techniques&lt;/a&gt;.&lt;/p&gt;
 
     &lt;p&gt;A detailed &lt;a
     
href="https://www.eff.org/deeplinks/2016/08/windows-10-microsoft-blatantly-disregards-user-choice-and-privacy-deep-dive"&gt;
-    analysis of Microsoft's scheme&lt;/a&gt; is available on the Electronic
+    analysis of Microsoft's scheme&lt;/a&gt; is available on</em></ins></span> 
the <span class="removed"><del><strong>option</strong></del></span> <span 
class="inserted"><ins><em>Electronic
     Frontier Foundation's website.&lt;/p&gt;
   &lt;/li&gt;
 
@@ -271,272 +307,219 @@
     &lt;p&gt;Microsoft has made companies'
     Windows machines managed by the company's sysadmins &lt;a
     
href="http://www.infoworld.com/article/3042397/microsoft-windows/admins-beware-domain-attached-pcs-are-sprouting-get-windows-10-ads.html"&gt;harangue
-    users to complain to the sysadmins about not &ldquo;upgrading&rdquo;
-    to Windows 10&lt;/a&gt;.&lt;/p&gt;
+    users to complain</em></ins></span> to <span 
class="removed"><del><strong>cancel or even postpone</strong></del></span> the
+   <span class="removed"><del><strong>imposed date of installation&lt;/a&gt;.
+   &lt;/p&gt;
+   &lt;p&gt;This demonstrates what we've said for years: using proprietary
+   software means letting someone have power over you, and you're
+   going</strong></del></span> <span class="inserted"><ins><em>sysadmins about 
not &ldquo;upgrading&rdquo;</em></ins></span>
+    to <span class="removed"><del><strong>get screwed sooner or 
later.&lt;/p&gt;&lt;/li&gt;
+
+  &lt;li&gt;&lt;p&gt;Microsoft</strong></del></span> <span 
class="inserted"><ins><em>Windows 10&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201601160"&gt;
-    &lt;p&gt;Microsoft has &lt;a
+    &lt;p&gt;Microsoft</em></ins></span> has &lt;a
     
href="http://www.theverge.com/2016/1/16/10780876/microsoft-windows-support-policy-new-processors-skylake"&gt;desupported
     all future Intel CPUs for Windows 7 and 8&lt;/a&gt;. Those
     machines will be stuck with the nastier Windows 10.  &lt;a
     
href="http://gizmodo.com/only-the-latest-version-of-windows-will-run-on-some-fut-1753545825"&gt;
-    AMD and Qualcomm CPUs, too&lt;/a&gt;.&lt;/p&gt;
+    AMD and Qualcomm CPUs, <span class="removed"><del><strong>too&lt;/a&gt;.
+  &lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>too&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 
     &lt;p&gt;Of course, Windows 7 and 8 are unethical too, because they are
     proprietary software.  But this example of Microsoft's wielding its
-    power demonstrates the power it holds.&lt;/p&gt;
+    power demonstrates the power it <span class="removed"><del><strong>holds.
+  &lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>holds.&lt;/p&gt;</em></ins></span>
 
     &lt;p&gt;Free software developers also stop maintaining old versions of
     their programs, but this is not unfair to users because the users of
     free software have control over it.  If it is important enough to you,
     you and other users can hire someone to support the old version on
-    your future platforms.&lt;/p&gt;
+    your future <span class="removed"><del><strong>platforms.
+  &lt;/p&gt;&lt;/li&gt;
+
+  &lt;li&gt;&lt;p&gt;Microsoft
+    is &lt;a 
href="http://gizmodo.com/woman-wins-10-000-from-microsoft-after-unwanted-window-1782666146"&gt;
+    forcibly pushing Windows
+    update to its version 10&lt;/a&gt;, ignoring</strong></del></span> <span 
class="inserted"><ins><em>platforms.&lt;/p&gt;
   &lt;/li&gt;
 &lt;/ul&gt;
 
 
-&lt;h3 id="jails"&gt;Microsoft Jails&lt;/h3&gt;
+&lt;h3 id="sabotage"&gt;Microsoft Sabotage&lt;/h3&gt;
 
-&lt;ul class="blurbs"&gt;
-&lt;!-- INSERT jails --&gt;
-  &lt;li id="M201706130"&gt;
-    &lt;p&gt;Windows 10 S was a jail: &lt;a
-    
href="https://www.theguardian.com/technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison"&gt;
-    only programs from the Windows Store could be
-    installed and executed&lt;/a&gt;. It was however possible to &lt;a
-    
href="https://www.theverge.com/2017/6/13/15789998/microsoft-windows-10-s-upgrade-windows-10-pro-guide"&gt;
-    upgrade to Windows 10 Pro&lt;/a&gt;. The successor of Windows
-    10 S is a special configuration of Windows 10 called &lt;a
-    
href="https://support.microsoft.com/en-gb/help/4020089/windows-10-in-s-mode-faq"&gt;
-    S mode&lt;/a&gt;. The major difference with Windows 10 S is that there is
-    an easy way to switch out of S mode.&lt;/p&gt;
-  &lt;/li&gt;
+&lt;p&gt;The wrongs in this section are not precisely malware, since they do
+not involve making</em></ins></span> the <span 
class="removed"><del><strong>flag on Windows 7 or 8</strong></del></span> <span 
class="inserted"><ins><em>program</em></ins></span> that <span 
class="removed"><del><strong>you could set to not upgrade.  This 
reaffirms</strong></del></span> <span class="inserted"><ins><em>runs in a way 
that hurts</em></ins></span> the <span class="removed"><del><strong>presence 
of</strong></del></span> <span class="inserted"><ins><em>user.
+But they are</em></ins></span> a <span class="removed"><del><strong>&lt;a 
href="/proprietary/proprietary-back-doors.html"&gt;universal
+    back door in Windows&lt;/a&gt; 7 and 8.&lt;/p&gt;&lt;/li&gt;
 
-  &lt;li id="M201210080"&gt;
-    &lt;p&gt;&lt;a
-    
href="http://www.itworld.com/article/2832657/operating-systems/microsoft-metro-app-store-lock-down.html"&gt;
-    Windows 8 on &ldquo;mobile devices&rdquo; (now defunct) was a
-    jail&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
-  &lt;/li&gt;
-&lt;/ul&gt;
+  &lt;li&gt;&lt;p&gt;Windows 10 &ldquo;upgrades&rdquo; &lt;a
+      
href="http://www.ghacks.net/2015/11/24/beware-latest-windows-10-update-may-remove-programs-automatically/"&gt;
+      delete applications&lt;/a&gt; without asking 
permission.&lt;/p&gt;&lt;/li&gt;
 
+  &lt;li&gt;&lt;p&gt;
+  Microsoft is &lt;a 
href="http://www.theguardian.com/technology/2015/sep/11/microsoft-downloading-windows-1"&gt;
+  repeatedly nagging many users to install Windows 10&lt;/a&gt;.
+  &lt;/p&gt;&lt;/li&gt;
 
-&lt;h3 id="sabotage"&gt;Microsoft Sabotage&lt;/h3&gt;
+&lt;li&gt;&lt;p&gt;
+Microsoft was for months &lt;a
+href="http://www.theguardian.com/technology/2016/feb/02/microsoft-downloading-windows-10-automatic-update"&gt;
+tricking users into &ldquo;upgrading&rdquo; to Windows 10&lt;/a&gt;, 
if</strong></del></span> <span class="inserted"><ins><em>lot like malware, 
since</em></ins></span> they
+<span class="removed"><del><strong>failed to notice and say no.
+&lt;/p&gt;&lt;/li&gt;
 
-&lt;p&gt;The wrongs in this section are not precisely malware, since they do
-not involve making the program that runs in a way that hurts the user.
-But they are a lot like malware, since they are technical Microsoft
-actions that harm <span class="removed"><del><strong>to</strong></del></span> 
the users of specific Microsoft software.&lt;/p&gt;
+  &lt;li&gt;&lt;p&gt;&lt;a
+href="https://web.archive.org/web/20130622044225/http://blogs.computerworlduk.com/open-enterprise/2013/06/how-can-any-company-ever-trust-microsoft-again/index.htm"&gt;</strong></del></span>
 <span class="inserted"><ins><em>are technical</em></ins></span> Microsoft 
<span class="removed"><del><strong>informs</strong></del></span>
+<span class="inserted"><ins><em>actions that harm</em></ins></span> the <span 
class="removed"><del><strong>NSA</strong></del></span> <span 
class="inserted"><ins><em>users</em></ins></span> of <span 
class="removed"><del><strong>bugs in Windows before fixing 
them.&lt;/a&gt;&lt;/p&gt;&lt;/li&gt;
 
-<span class="removed"><del><strong>&lt;ul&gt;
-  &lt;li&gt;&lt;p&gt; Microsoft</strong></del></span>
+  &lt;li&gt;&lt;p&gt;&lt;a 
href="http://www.computerworlduk.com/blogs/open-enterprise/windows-xp-end-of-an-era-end-of-an-error-3569489/"&gt;</strong></del></span>
 <span class="inserted"><ins><em>specific</em></ins></span> Microsoft <span 
class="removed"><del><strong>cut off security fixes for</strong></del></span> 
<span class="inserted"><ins><em>software.&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;ul class="blurbs"&gt;
-&lt;!-- INSERT sabotage --&gt;
+&lt;ul class="blurbs"&gt;
+&lt;!-- INSERT microsoft-sab --&gt;
   &lt;li id="M201704194"&gt;
-    &lt;p&gt;Microsoft has made Windows 7
-    and 8 cease to function on certain new computers, &lt;a
+    &lt;p&gt;Microsoft has made</em></ins></span> Windows <span 
class="removed"><del><strong>XP, except</strong></del></span> <span 
class="inserted"><ins><em>7
+    and 8 cease</em></ins></span> to <span class="removed"><del><strong>some 
big users
+  that pay exorbitantly.&lt;/a&gt;&lt;/p&gt;
+
+  &lt;p&gt;Microsoft is going</strong></del></span> <span 
class="inserted"><ins><em>function on certain new computers, &lt;a
     
href="https://support.microsoft.com/en-us/help/4012982/the-processor-is-not-supported-together-with-the-windows-version-that"&gt;effectively
-    forcing their owners to switch to Windows 10&lt;/a&gt;.&lt;/p&gt;
+    forcing their owners to switch</em></ins></span> to <span 
class="inserted"><ins><em>Windows 10&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201704130"&gt;
-    &lt;p&gt;Microsoft</em></ins></span> &lt;a
-    
href="https://arstechnica.com/information-technology/2017/04/new-processors-are-now-blocked-from-receiving-updates-on-old-windows/"&gt;
-    has dropped support for Windows 7 and 8 on recent processors&lt;/a&gt;
-    in a big hurry.&lt;/p&gt;
-
-    &lt;p&gt;It makes no difference what legitimate reasons Microsoft might
-    have for not doing work to support them. If it doesn't want to do
-    this work, it should let users do the work.&lt;/p&gt;
+    &lt;p&gt;Microsoft</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.computerworlduk.com/news/security/3605515/more-than-half-of-all-ie-users-face-patch-axe-in-10-months/"&gt;
+  cut off</strong></del></span>
+    <span 
class="inserted"><ins><em>href="https://arstechnica.com/information-technology/2017/04/new-processors-are-now-blocked-from-receiving-updates-on-old-windows/"&gt;
+    has dropped</em></ins></span> support for <span 
class="removed"><del><strong>some Internet Explorer versions&lt;/a&gt; in the 
same way.&lt;/p&gt;
+
+  &lt;p&gt;A person or company has the right to cease to 
work</strong></del></span> <span class="inserted"><ins><em>Windows 7 and 
8</em></ins></span> on <span class="inserted"><ins><em>recent 
processors&lt;/a&gt;
+    in</em></ins></span> a
+  <span class="removed"><del><strong>particular program; the wrong here 
is</strong></del></span> <span class="inserted"><ins><em>big hurry.&lt;/p&gt;
+
+    &lt;p&gt;It makes no difference what legitimate reasons</em></ins></span> 
Microsoft <span class="removed"><del><strong>does this after having
+  made the users dependent on Microsoft, because they 
are</strong></del></span> <span class="inserted"><ins><em>might
+    have for</em></ins></span> not <span 
class="removed"><del><strong>free</strong></del></span> <span 
class="inserted"><ins><em>doing work</em></ins></span> to <span 
class="removed"><del><strong>ask
+  anyone else</strong></del></span> <span class="inserted"><ins><em>support 
them. If it doesn't want</em></ins></span> to <span 
class="removed"><del><strong>work on the program for them.&lt;/p&gt;&lt;/li&gt;
+&lt;/ul&gt;
+
+&lt;h3 id="interference"&gt;Microsoft Interference&lt;/h3&gt;
+
+&lt;p&gt;Various proprietary programs often mess up</strong></del></span> 
<span class="inserted"><ins><em>do
+    this work, it should let users do</em></ins></span> the <span 
class="removed"><del><strong>user's system. They are like sabotage, but they 
are not grave enough</strong></del></span> <span 
class="inserted"><ins><em>work.&lt;/p&gt;
   &lt;/li&gt;
 
-  <span class="removed"><del><strong>&lt;li&gt;
-    &lt;p&gt;Microsoft has made</strong></del></span>
+  &lt;li id="M201606270"&gt;
+    &lt;p id="windows10-forcing"&gt;In its efforts</em></ins></span> to <span 
class="removed"><del><strong>qualify 
+for the word &ldquo;sabotage&rdquo;. Nonetheless, they are nasty and wrong. 
This section describes examples</strong></del></span> <span 
class="inserted"><ins><em>trick users</em></ins></span> of <span 
class="inserted"><ins><em>Windows
+    7 and 8 into installing all-spying Windows 10 against their
+    will,</em></ins></span> Microsoft <span 
class="removed"><del><strong>committing
+interference.&lt;/p&gt;
 
-  <span class="inserted"><ins><em>&lt;li id="M201606270"&gt;
-    &lt;p id="windows10-forcing"&gt;In its efforts to trick users 
of</em></ins></span> Windows
-    7 and 8 <span class="removed"><del><strong>cease to function on certain
-      new computers,
-      &lt;a 
href="https://support.microsoft.com/en-us/help/4012982/discusses-an-issue-in-which-you-receive-a-your-pc-uses-a-processor-tha"&gt;effectively
-      forcing</strong></del></span> <span class="inserted"><ins><em>into 
installing all-spying Windows 10 against</em></ins></span> their <span 
class="removed"><del><strong>owners to switch</strong></del></span>
-    <span class="inserted"><ins><em>will, Microsoft forced their 
computers</em></ins></span> to <span class="inserted"><ins><em>&lt;a
-    
href="https://www.theguardian.com/technology/2015/sep/11/microsoft-downloading-windows-1"&gt;
-    silently download&hellip; the whole of</em></ins></span> Windows <span 
class="removed"><del><strong>10&lt;/a&gt;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>10&lt;/a&gt;! Apparently,
+&lt;ul&gt;
+  &lt;li&gt;&lt;p&gt;Windows displays</strong></del></span> <span 
class="inserted"><ins><em>forced their computers to</em></ins></span> &lt;a 
<span 
class="removed"><del><strong>href="http://www.theverge.com/2017/3/17/14956540/microsoft-windows-10-ads-taskbar-file-explorer"&gt;
+       intrusive ads for Microsoft products and its
+       partners' products&lt;/a&gt;.&lt;/p&gt;
+    &lt;p&gt;The article's author starts from</strong></del></span>
+    <span 
class="inserted"><ins><em>href="https://www.theguardian.com/technology/2015/sep/11/microsoft-downloading-windows-1"&gt;
+    silently download&hellip;</em></ins></span> the <span 
class="removed"><del><strong>premise</strong></del></span> <span 
class="inserted"><ins><em>whole of Windows 10&lt;/a&gt;! Apparently,
     this was done through a &lt;a
     href="/proprietary/proprietary-back-doors.html#windows-update"&gt;
     universal back door&lt;/a&gt;. Not only did the unwanted downloads &lt;a
     
href="https://www.theregister.co.uk/2016/06/03/windows_10_upgrade_satellite_link/"&gt;
     use up much needed resources&lt;/a&gt;, but many of the people who let
-    installation proceed found out that this &ldquo;upgrade&rdquo; was in fact 
a &lt;a
+    installation proceed found out</em></ins></span> that <span 
class="inserted"><ins><em>this &ldquo;upgrade&rdquo; was in fact a &lt;a
     
href="http://gizmodo.com/woman-wins-10-000-from-microsoft-after-unwanted-window-1782666146"&gt;
-    downgrade&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
+    downgrade&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;
 
-  <span 
class="removed"><del><strong>&lt;li&gt;&lt;p&gt;Once</strong></del></span>
-
-  <span class="inserted"><ins><em>&lt;li id="M201606010"&gt;
-    &lt;p&gt;Once</em></ins></span> Microsoft has tricked a user
-    into accepting installation of <span class="removed"><del><strong>Windows
-   10, &lt;a 
href="http://www.theregister.co.uk/2016/06/01/windows_10_nagware_no_way_out/"&gt;they
-   find that they are denied the option to cancel or even postpone the
-   imposed date of installation&lt;/a&gt;.
-   &lt;/p&gt;
-   &lt;p&gt;This demonstrates what we've said for years: using proprietary
-   software means letting someone have power over you, and you're
-   going to get screwed sooner or later.&lt;/p&gt;&lt;/li&gt;
+  &lt;li id="M201606010"&gt;
+    &lt;p&gt;Once</em></ins></span> Microsoft has <span 
class="inserted"><ins><em>tricked</em></ins></span> a <span 
class="removed"><del><strong>right to control what</strong></del></span> <span 
class="inserted"><ins><em>user
+    into accepting installation of</em></ins></span> Windows <span 
class="removed"><del><strong>does to users, as long as it
+      doesn't go &ldquo;too far&rdquo;. We disagree.&lt;/p&gt;&lt;/li&gt;
 
-  &lt;li&gt;&lt;p&gt;Microsoft
-  has &lt;a 
href="http://www.theverge.com/2016/1/16/10780876/microsoft-windows-support-policy-new-processors-skylake"&gt;desupported
-  all future Intel CPUs for Windows 7 and 8&lt;/a&gt;. Those machines will
-  be stuck with the nastier Windows 10.
-  &lt;a 
href="http://gizmodo.com/only-the-latest-version-of-windows-will-run-on-some-fut-1753545825"&gt;
-  AMD and Qualcomm CPUs, too&lt;/a&gt;.
-  &lt;/p&gt;
-  &lt;p&gt;Of course, Windows 7 and 8 are unethical too, because they are
-  proprietary software.  But this example of Microsoft's wielding its
-  power demonstrates the power it holds.
-  &lt;/p&gt;
-  &lt;p&gt;Free software developers also stop maintaining old versions of
-  their programs, but this is not unfair</strong></del></span> <span 
class="inserted"><ins><em>Windows 10, &lt;a
-    
href="https://www.theregister.co.uk/2016/06/01/windows_10_nagware_no_way_out/"&gt;they
-    find that they are denied the option</em></ins></span> to <span 
class="removed"><del><strong>users because</strong></del></span> <span 
class="inserted"><ins><em>cancel or even postpone</em></ins></span> the
-  <span class="removed"><del><strong>users</strong></del></span>
-    <span class="inserted"><ins><em>imposed date</em></ins></span> of <span 
class="removed"><del><strong>free</strong></del></span> <span 
class="inserted"><ins><em>installation&lt;/a&gt;.&lt;/p&gt;
-
-    &lt;p&gt;This demonstrates what we've said for years: using 
proprietary</em></ins></span>
-    software <span class="inserted"><ins><em>means letting 
someone</em></ins></span> have <span 
class="removed"><del><strong>control</strong></del></span> <span 
class="inserted"><ins><em>power</em></ins></span> over <span 
class="removed"><del><strong>it.  If it is important
-  enough to</strong></del></span> you, <span 
class="removed"><del><strong>you</strong></del></span> and <span 
class="removed"><del><strong>other users can hire someone to support
-  the old version on your future platforms.
-  &lt;/p&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;p&gt;Microsoft inserts</strong></del></span> <span 
class="inserted"><ins><em>10,</em></ins></span> &lt;a
+<span 
class="removed"><del><strong>href="https://www.theguardian.com/technology/2017/mar/10/windows-10-users-complain-new-microsoft-subscription-onedrive-adverts"&gt;
+      annoying advertisements inside of</strong></del></span>
+    <span 
class="inserted"><ins><em>href="https://www.theregister.co.uk/2016/06/01/windows_10_nagware_no_way_out/"&gt;they
+    find that they are denied</em></ins></span> the <span 
class="removed"><del><strong>File Explorer&lt;/a&gt;</strong></del></span> 
<span class="inserted"><ins><em>option</em></ins></span> to <span 
class="removed"><del><strong>nag
+      users</strong></del></span> <span class="inserted"><ins><em>cancel or 
even postpone the
+    imposed date of installation&lt;/a&gt;.&lt;/p&gt;
 
-  &lt;li&gt;&lt;p&gt;Microsoft
-    is &lt;a 
href="http://gizmodo.com/woman-wins-10-000-from-microsoft-after-unwanted-window-1782666146"&gt;
-    forcibly pushing Windows
-    update</strong></del></span> <span class="inserted"><ins><em>you're 
going</em></ins></span>
-    to <span class="removed"><del><strong>its version 10&lt;/a&gt;, ignoring 
the flag on Windows 7</strong></del></span> <span class="inserted"><ins><em>get 
screwed sooner</em></ins></span> or <span class="removed"><del><strong>8
-    that you could set</strong></del></span> <span 
class="inserted"><ins><em>later.&lt;/p&gt;
+    &lt;p&gt;This demonstrates what we've said for years: using proprietary
+    software means letting someone have power over you, and you're 
going</em></ins></span>
+    to <span class="removed"><del><strong>buy 
subscriptions</strong></del></span> <span class="inserted"><ins><em>get screwed 
sooner or later.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201601310"&gt;
-    &lt;p&gt;FTDI's proprietary driver
-    for its USB-to-serial chips has been designed</em></ins></span> to <span 
class="removed"><del><strong>not upgrade.  This reaffirms the presence of
-    a</strong></del></span> &lt;a <span 
class="removed"><del><strong>href="/proprietary/proprietary-back-doors.html"&gt;universal
-    back door in Windows&lt;/a&gt; 7 and 8.&lt;/p&gt;&lt;/li&gt;
+    &lt;p&gt;FTDI's proprietary driver</em></ins></span>
+    for <span class="removed"><del><strong>the OneDrive 
service.&lt;/p&gt;&lt;/li&gt;
 
-  &lt;li&gt;&lt;p&gt;Windows</strong></del></span>
-    <span 
class="inserted"><ins><em>href="http://arstechnica.com/information-technology/2014/10/windows-update-drivers-bricking-usb-serial-chips-beloved-of-hardware-hackers/"&gt;sabotage
+&lt;li&gt;In order</strong></del></span> <span class="inserted"><ins><em>its 
USB-to-serial chips has been designed</em></ins></span> to <span 
class="removed"><del><strong>increase Windows 10's install 
base,</strong></del></span> <span class="inserted"><ins><em>&lt;a
+    
href="http://arstechnica.com/information-technology/2014/10/windows-update-drivers-bricking-usb-serial-chips-beloved-of-hardware-hackers/"&gt;sabotage
     alternative compatible chips&lt;/a&gt;
-    so that they no longer work. Microsoft is &lt;a
-    
href="http://it.slashdot.org/story/16/01/31/1720259/ftdi-driver-breaks-hardware-again"&gt;installing
-    this automatically&lt;/a&gt; as an &ldquo;upgrade&rdquo;.&lt;/p&gt;
+    so that they no longer work.</em></ins></span> Microsoft <span 
class="inserted"><ins><em>is</em></ins></span> &lt;a
+<span 
class="removed"><del><strong>href="https://www.eff.org/deeplinks/2016/08/windows-10-microsoft-blatantly-disregards-user-choice-and-privacy-deep-dive"&gt;
+blatantly disregards user choice and privacy&lt;/a&gt;.</strong></del></span>
+    <span 
class="inserted"><ins><em>href="http://it.slashdot.org/story/16/01/31/1720259/ftdi-driver-breaks-hardware-again"&gt;installing
+    this automatically&lt;/a&gt; as an 
&ldquo;upgrade&rdquo;.&lt;/p&gt;</em></ins></span>
   &lt;/li&gt;
 
-  &lt;li id="M201511240"&gt;
-    &lt;p&gt;Windows</em></ins></span> 10 &ldquo;upgrades&rdquo; &lt;a
-    
href="http://www.ghacks.net/2015/11/24/beware-latest-windows-10-update-may-remove-programs-automatically/"&gt;
-    delete applications&lt;/a&gt; without asking <span 
class="removed"><del><strong>permission.&lt;/p&gt;&lt;/li&gt;
-
-  &lt;li&gt;&lt;p&gt;
-  Microsoft is &lt;a 
href="http://www.theguardian.com/technology/2015/sep/11/microsoft-downloading-windows-1"&gt;
-  repeatedly nagging many users to install Windows 10&lt;/a&gt;.
-  &lt;/p&gt;&lt;/li&gt;
-
-&lt;li&gt;&lt;p&gt;
-Microsoft was for months &lt;a
-href="http://www.theguardian.com/technology/2016/feb/02/microsoft-downloading-windows-10-automatic-update"&gt;
-tricking users into &ldquo;upgrading&rdquo; to Windows 10&lt;/a&gt;, if they
-failed to notice and say no.
-&lt;/p&gt;&lt;/li&gt;
-
-  &lt;li&gt;&lt;p&gt;&lt;a
-href="https://web.archive.org/web/20130622044225/http://blogs.computerworlduk.com/open-enterprise/2013/06/how-can-any-company-ever-trust-microsoft-again/index.htm"&gt;
-  Microsoft informs the NSA of bugs in Windows before fixing 
them.&lt;/a&gt;&lt;/p&gt;&lt;/li&gt;
+<span class="removed"><del><strong>&lt;li&gt;&lt;p&gt;Microsoft has
+started</strong></del></span>
 
-  &lt;li&gt;&lt;p&gt;&lt;a 
href="http://www.computerworlduk.com/blogs/open-enterprise/windows-xp-end-of-an-era-end-of-an-error-3569489/"&gt;
-  Microsoft</strong></del></span> <span 
class="inserted"><ins><em>permission.&lt;/p&gt;
+  <span class="inserted"><ins><em>&lt;li id="M201511240"&gt;
+    &lt;p&gt;Windows 10 &ldquo;upgrades&rdquo;</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="https://www.theguardian.com/technology/2016/jul/04/microsoft-windows-10-full-screen-upgrade-notification-pop-up-reminder"&gt;nagging</strong></del></span>
+    <span 
class="inserted"><ins><em>href="http://www.ghacks.net/2015/11/24/beware-latest-windows-10-update-may-remove-programs-automatically/"&gt;
+    delete applications&lt;/a&gt; without asking permission.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201503260"&gt;
     &lt;p&gt;&lt;a
-    
href="https://www.computerworlduk.com/it-business/windows-xp-end-of-an-era-end-of-an-error-3569489/"&gt;Microsoft</em></ins></span>
-    cut off security fixes for Windows XP, except to some big users that
-    pay <span 
class="removed"><del><strong>exorbitantly.&lt;/a&gt;&lt;/p&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>exorbitantly&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
-
-    &lt;p&gt;Microsoft is going <span class="removed"><del><strong>to
-  &lt;a 
href="http://www.computerworlduk.com/news/security/3605515/more-than-half-of-all-ie-users-face-patch-axe-in-10-months/"&gt;
-  cut off support for some Internet Explorer versions&lt;/a&gt; in the same 
way.&lt;/p&gt;
-
-  &lt;p&gt;A person or company has the right to cease to work on a
-  particular program; the wrong here is Microsoft does this after having
-  made the users dependent on Microsoft, because they are not free to ask
-  anyone else to work on the program for them.&lt;/p&gt;&lt;/li&gt;
-&lt;/ul&gt;
+    
href="https://www.computerworlduk.com/it-business/windows-xp-end-of-an-era-end-of-an-error-3569489/"&gt;Microsoft
+    cut off security fixes for Windows XP, except to some 
big</em></ins></span> users <span class="removed"><del><strong>obnoxiously and 
repeatedly</strong></del></span> <span class="inserted"><ins><em>that
+    pay exorbitantly&lt;/a&gt;.&lt;/p&gt;
 
-&lt;h3 id="interference"&gt;Microsoft Interference&lt;/h3&gt;
+    &lt;p&gt;Microsoft is going</em></ins></span> to <span 
class="removed"><del><strong>install Windows 10&lt;/a&gt;.&lt;/p&gt;&lt;/li&gt;
 
-&lt;p&gt;Various proprietary programs often mess up the user's system. They 
are like sabotage, but they are not grave enough to qualify 
-for the word &ldquo;sabotage&rdquo;. Nonetheless, they are nasty and wrong. 
This section describes examples of Microsoft committing
-interference.&lt;/p&gt;
+  &lt;li&gt;&lt;p&gt;Microsoft
+      &lt;a 
href="http://news.softpedia.com/news/windows-10-upgrade-reportedly-starting-automatically-on-windows-7-pcs-501651.shtml"&gt;is
+        tricking
+        users&lt;/a&gt;</strong></del></span> &lt;a
+<span 
class="removed"><del><strong>href="https://web.archive.org/web/20160522062607/http://www.theregister.co.uk/2016/03/17/microsoft_windows_10_upgrade_gwx_vs_humanity/"&gt;
+into replacing Windows 7 with Windows 10&lt;/a&gt;.&lt;/p&gt;&lt;/li&gt;
 
-&lt;ul&gt;
-  &lt;li&gt;&lt;p&gt;Windows displays</strong></del></span> <span 
class="inserted"><ins><em>to</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.theverge.com/2017/3/17/14956540/microsoft-windows-10-ads-taskbar-file-explorer"&gt;
-       intrusive ads</strong></del></span>
+  &lt;li&gt;&lt;p&gt;Microsoft</strong></del></span>
     <span 
class="inserted"><ins><em>href="https://www.computerworlduk.com/applications/more-than-half-of-all-ie-users-face-patch-axe-in-10-months-3605515/"&gt;
-    cut off support</em></ins></span> for <span 
class="removed"><del><strong>Microsoft products and its
-       partners' products&lt;/a&gt;.&lt;/p&gt;
-    &lt;p&gt;The article's author starts from</strong></del></span> <span 
class="inserted"><ins><em>some Internet Explorer versions&lt;/a&gt; 
in</em></ins></span> the <span class="removed"><del><strong>premise that 
Microsoft</strong></del></span> <span class="inserted"><ins><em>same
+    cut off support for some Internet Explorer versions&lt;/a&gt; in the same
     way.&lt;/p&gt;
 
-    &lt;p&gt;A person or company</em></ins></span> has <span 
class="removed"><del><strong>a</strong></del></span> <span 
class="inserted"><ins><em>the</em></ins></span> right to <span 
class="removed"><del><strong>control what Windows does</strong></del></span> 
<span class="inserted"><ins><em>cease</em></ins></span> to <span 
class="removed"><del><strong>users, as long as it
-      doesn't go &ldquo;too far&rdquo;. We disagree.&lt;/p&gt;&lt;/li&gt;
-  
-  &lt;li&gt;&lt;p&gt;Microsoft inserts &lt;a
-href="https://www.theguardian.com/technology/2017/mar/10/windows-10-users-complain-new-microsoft-subscription-onedrive-adverts"&gt;
-      annoying advertisements inside of</strong></del></span> <span 
class="inserted"><ins><em>work on a particular
-    program; the wrong here is Microsoft does this after having 
made</em></ins></span> the <span class="removed"><del><strong>File 
Explorer&lt;/a&gt; to nag</strong></del></span>
-    users <span class="inserted"><ins><em>dependent on Microsoft, because they 
are not free</em></ins></span> to <span class="removed"><del><strong>buy 
subscriptions</strong></del></span> <span class="inserted"><ins><em>ask anyone
-    else to work on the program</em></ins></span> for <span 
class="inserted"><ins><em>them.&lt;/p&gt;
+    &lt;p&gt;A person or company</em></ins></span> has <span 
class="inserted"><ins><em>the right to cease to work on a particular
+    program; the wrong here is Microsoft does this after 
having</em></ins></span> made <span class="removed"><del><strong>companies' 
Windows machines managed by</strong></del></span> the
+<span class="removed"><del><strong>company's
+sysadmins &lt;a 
href="http://www.infoworld.com/article/3042397/microsoft-windows/admins-beware-domain-attached-pcs-are-sprouting-get-windows-10-ads.html"&gt;harangue</strong></del></span>
+    users <span class="inserted"><ins><em>dependent on Microsoft, because they 
are not free</em></ins></span> to <span 
class="removed"><del><strong>complain</strong></del></span> <span 
class="inserted"><ins><em>ask anyone
+    else</em></ins></span> to <span class="inserted"><ins><em>work 
on</em></ins></span> the <span class="removed"><del><strong>sysadmins about not 
&ldquo;upgrading&rdquo; to</strong></del></span> <span 
class="inserted"><ins><em>program for them.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201306220"&gt;
     &lt;p&gt;&lt;a
     
href="https://web.archive.org/web/20130622044225/http://blogs.computerworlduk.com/open-enterprise/2013/06/how-can-any-company-ever-trust-microsoft-again/index.htm"&gt;Microsoft
-    informs</em></ins></span> the <span class="removed"><del><strong>OneDrive 
service.&lt;/p&gt;&lt;/li&gt;
-
-&lt;li&gt;In order to increase</strong></del></span> <span 
class="inserted"><ins><em>NSA of bugs in</em></ins></span> Windows <span 
class="removed"><del><strong>10's install base, Microsoft
-&lt;a
-href="https://www.eff.org/deeplinks/2016/08/windows-10-microsoft-blatantly-disregards-user-choice-and-privacy-deep-dive"&gt;
-blatantly disregards user choice and privacy&lt;/a&gt;.</strong></del></span> 
<span class="inserted"><ins><em>before fixing 
them&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
+    informs the NSA of bugs in</em></ins></span> Windows
+<span 
class="removed"><del><strong>10&lt;/a&gt;.&lt;/p&gt;&lt;/li&gt;</strong></del></span>
 <span class="inserted"><ins><em>before fixing them&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;
-
-<span class="removed"><del><strong>&lt;li&gt;&lt;p&gt;Microsoft has
-started &lt;a 
href="https://www.theguardian.com/technology/2016/jul/04/microsoft-windows-10-full-screen-upgrade-notification-pop-up-reminder"&gt;nagging</strong></del></span>
-<span class="inserted"><ins><em>&lt;/ul&gt;
+&lt;/ul&gt;
 
 
 &lt;h3 id="subscriptions"&gt;Microsoft Subscriptions&lt;/h3&gt;
 
 &lt;ul class="blurbs"&gt;
-&lt;!-- INSERT subscriptions --&gt;
+&lt;!-- INSERT microsoft-subscript --&gt;
   &lt;li id="M201507150"&gt;
-    &lt;p&gt;Microsoft Office forces</em></ins></span> users <span 
class="removed"><del><strong>obnoxiously and repeatedly to install Windows 
10&lt;/a&gt;.&lt;/p&gt;&lt;/li&gt;
-
-  &lt;li&gt;&lt;p&gt;Microsoft
-      &lt;a 
href="http://news.softpedia.com/news/windows-10-upgrade-reportedly-starting-automatically-on-windows-7-pcs-501651.shtml"&gt;is
-        tricking
-        users&lt;/a&gt; &lt;a
-href="https://web.archive.org/web/20160522062607/http://www.theregister.co.uk/2016/03/17/microsoft_windows_10_upgrade_gwx_vs_humanity/"&gt;
-into replacing Windows 7 with Windows 10&lt;/a&gt;.&lt;/p&gt;&lt;/li&gt;
-
-  &lt;li&gt;&lt;p&gt;Microsoft has made companies' Windows machines managed by 
the
-company's
-sysadmins</strong></del></span> &lt;a <span 
class="removed"><del><strong>href="http://www.infoworld.com/article/3042397/microsoft-windows/admins-beware-domain-attached-pcs-are-sprouting-get-windows-10-ads.html"&gt;harangue
-users</strong></del></span>
-    <span 
class="inserted"><ins><em>href="https://www.computerworld.com/article/2948755/windows-apps/office-for-windows-10-will-require-office-365-subscription-on-pcs-larger-tablets.html"&gt;to
-    subscribe</em></ins></span> to <span 
class="removed"><del><strong>complain</strong></del></span> <span 
class="inserted"><ins><em>Office 365</em></ins></span> to <span 
class="removed"><del><strong>the sysadmins about not 
&ldquo;upgrading&rdquo;</strong></del></span> <span 
class="inserted"><ins><em>be able</em></ins></span> to <span 
class="removed"><del><strong>Windows
-10&lt;/a&gt;.&lt;/p&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>create/edit documents&lt;/a&gt;.&lt;/p&gt;
+    &lt;p&gt;Microsoft Office forces users &lt;a
+    
href="https://www.computerworld.com/article/2948755/windows-apps/office-for-windows-10-will-require-office-365-subscription-on-pcs-larger-tablets.html"&gt;to
+    subscribe to Office 365 to be able to create/edit 
documents&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;</em></ins></span>
 &lt;/ul&gt;
 
@@ -647,12 +630,12 @@
     its users&lt;/a&gt;, giving Microsoft the &ldquo;right&rdquo; to snoop on
     the users' files, text input, voice input, location info, contacts,
     calendar records and web browsing history, as well as automatically
-    connecting the machines to open hotspots and showing targeted 
ads.&lt;/p&gt;
+    connecting the machines to open
+  <span class="removed"><del><strong>hotspots and showing targeted 
ads.&lt;/p&gt;
 
-    &lt;p&gt;We can suppose Microsoft look at users' files for the US 
government
-    on demand, though the &ldquo;privacy policy&rdquo; does not <span 
class="removed"><del><strong>explicit</strong></del></span> <span 
class="inserted"><ins><em>explicitly</em></ins></span>
-    say so. Will it look at users' files for the Chinese government
-    on <span class="removed"><del><strong>demand?&lt;/p&gt;&lt;/li&gt;
+  &lt;p&gt;We can suppose Microsoft look at users' files for the US government 
on
+  demand, though the &ldquo;privacy policy&rdquo; does not explicit say so. 
Will it
+  look at users' files for the Chinese government on 
demand?&lt;/p&gt;&lt;/li&gt;
 
   &lt;li&gt;&lt;p&gt;
   &lt;a 
href="http://arstechnica.com/information-technology/2015/08/even-when-told-not-to-windows-10-just-cant-stop-talking-to-microsoft/"&gt;
@@ -664,15 +647,19 @@
   track the browsing of each specific user.&lt;/p&gt;&lt;/li&gt;
 
   &lt;li&gt;Spyware in Windows 8: &lt;a 
href="https://web.archive.org/web/20160313105805/http://www.theregister.co.uk/2003/02/28/windows_update_keeps_tabs/"&gt;
-  Windows Update snoops on the user.&lt;/a&gt;
+  Windows Update snoops on</strong></del></span> <span 
class="inserted"><ins><em>hotspots and showing targeted ads.&lt;/p&gt;
+
+    &lt;p&gt;We can suppose Microsoft look at users' files 
for</em></ins></span> the <span class="removed"><del><strong>user.&lt;/a&gt;
   &lt;a 
href="http://www.infoworld.com/t/microsoft-windows/look-the-black-underbelly-of-windows-81-blue-222175"&gt;
-  Windows 8.1 snoops on local searches.&lt;/a&gt; And there's a
+  Windows 8.1 snoops</strong></del></span> <span class="inserted"><ins><em>US 
government</em></ins></span>
+    on <span class="removed"><del><strong>local searches.&lt;/a&gt; And 
there's a
   &lt;a href="http://www.marketoracle.co.uk/Article40836.html"&gt;
   secret NSA key in Windows&lt;/a&gt;, whose functions we don't 
know.&lt;/li&gt;
 
   &lt;li&gt;&lt;p&gt;
   &lt;a 
href="http://www.itproportal.com/2014/05/14/microsoft-openly-offered-cloud-data-fbi-and-nsa/"&gt;
-  Microsoft SkyDrive allows the NSA to directly examine users' 
data.&lt;/a&gt;&lt;/p&gt;
+  Microsoft SkyDrive allows</strong></del></span> <span 
class="inserted"><ins><em>demand, though</em></ins></span> the <span 
class="removed"><del><strong>NSA to directly examine</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;privacy policy&rdquo; does not explicitly
+    say so. Will it look at</em></ins></span> users' <span 
class="removed"><del><strong>data.&lt;/a&gt;&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li&gt;&lt;p&gt;Spyware in Skype:
@@ -680,7 +667,8 @@
       
http://www.forbes.com/sites/petercohan/2013/06/20/project-chess-how-u-s-snoops-on-your-skype/&lt;/a&gt;.
       Microsoft changed Skype
       &lt;a 
href="http://www.guardian.co.uk/world/2013/jul/11/microsoft-nsa-collaboration-user-data"&gt;
-      specifically for spying&lt;/a&gt;.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>demand?&lt;/p&gt;</em></ins></span>
+      specifically</strong></del></span> <span 
class="inserted"><ins><em>files</em></ins></span> for <span 
class="removed"><del><strong>spying&lt;/a&gt;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>the Chinese government
+    on demand?&lt;/p&gt;</em></ins></span>
   &lt;/li&gt;
 
   <span class="removed"><del><strong>&lt;li&gt;&lt;p&gt;
@@ -713,59 +701,77 @@
 &lt;h3 id="drm"&gt;Microsoft DRM&lt;/h3&gt;
 &lt;ul&gt;
   &lt;li&gt;&lt;p&gt;&lt;a 
href="http://arstechnica.com/apple/2007/08/aacs-tentacles/"&gt;
-  DRM (digital restrictions mechanisms) in Windows&lt;/a&gt;, introduced to
-  cater to</strong></del></span> <span class="inserted"><ins><em>now.&lt;/p&gt;
+  DRM (digital restrictions mechanisms) in Windows&lt;/a&gt;, 
introduced</strong></del></span> <span class="inserted"><ins><em>now.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201410040"&gt;
-    &lt;p&gt;It only gets worse with time.</em></ins></span>  &lt;a <span 
class="removed"><del><strong>href="/proprietary/proprietary-drm.html#bluray"&gt;Bluray&lt;/a&gt;
 disks.
-  (The article also talks about how the same malware would later be introduced
-  in MacOS.)&lt;/p&gt;&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;h3 id="jails"&gt;Microsoft Jails&lt;/h3&gt;
-&lt;ul&gt;
-  &lt;li&gt;
-       &lt;p&gt;Windows 10 S ought to be called</strong></del></span>
-    <span 
class="inserted"><ins><em>href="http://www.techworm.net/2014/10/microsofts-windows-10-permission-watch-every-move.html"&gt;</em></ins></span>
-    Windows 10 <span class="removed"><del><strong>J,</strong></del></span> 
<span class="inserted"><ins><em>requires users to give 
permission</em></ins></span> for <span 
class="removed"><del><strong>&ldquo;Jail&rdquo;:
-       &lt;a 
href="https://www.theguardian.com/technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison"&gt;only
 programs from the Windows Store can be
-       downloaded</strong></del></span> <span class="inserted"><ins><em>total 
snooping&lt;/a&gt;,
-    including their files, their commands, their text input,</em></ins></span> 
and <span class="removed"><del><strong>executed&lt;/a&gt;.&lt;/p&gt;
-
-       &lt;p&gt;If</strong></del></span> <span class="inserted"><ins><em>their
+    &lt;p&gt;It only gets worse with time.  &lt;a
+    
href="http://www.techworm.net/2014/10/microsofts-windows-10-permission-watch-every-move.html"&gt;
+    Windows 10 requires users</em></ins></span> to
+  <span class="removed"><del><strong>cater</strong></del></span> <span 
class="inserted"><ins><em>give permission for total snooping&lt;/a&gt;,
+    including their files, their commands, their text input, and their
     voice input.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201405140"&gt;
     &lt;p&gt;&lt;a
     
href="http://www.itproportal.com/2014/05/14/microsoft-openly-offered-cloud-data-fbi-and-nsa/"&gt;
-    Microsoft SkyDrive allows</em></ins></span> the <span 
class="removed"><del><strong>history</strong></del></span> <span 
class="inserted"><ins><em>NSA to directly examine users'
+    Microsoft SkyDrive allows the NSA</em></ins></span> to <span 
class="inserted"><ins><em>directly examine users'
     data&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201307110"&gt;
-    &lt;p&gt;Skype contains &lt;a
-    
href="https://web.archive.org/web/20130928235637/http://www.forbes.com/sites/petercohan/2013/06/20/project-chess-how-u-s-snoops-on-your-skype/"&gt;spyware&lt;/a&gt;.
+    &lt;p&gt;Skype contains</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/proprietary/proprietary-drm.html#bluray"&gt;Bluray&lt;/a&gt;
 disks.
+  (The article also talks about how</strong></del></span>
+    <span 
class="inserted"><ins><em>href="https://web.archive.org/web/20130928235637/http://www.forbes.com/sites/petercohan/2013/06/20/project-chess-how-u-s-snoops-on-your-skype/"&gt;spyware&lt;/a&gt;.
     Microsoft changed Skype &lt;a
     
href="http://www.guardian.co.uk/world/2013/jul/11/microsoft-nsa-collaboration-user-data"&gt;
     specifically for spying&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201307080"&gt;
-    &lt;p&gt;Spyware in older versions</em></ins></span> of <span 
class="removed"><del><strong>iOS as a jail is any 
indication,</strong></del></span> <span class="inserted"><ins><em>Windows: &lt;a
-    
href="https://www.theregister.co.uk/2003/02/28/windows_update_keeps_tabs/"&gt;</em></ins></span>
-    Windows <span class="removed"><del><strong>10 J
-       will be no better.&lt;/p&gt;
+    &lt;p&gt;Spyware in older versions of Windows: &lt;a
+    
href="https://www.theregister.co.uk/2003/02/28/windows_update_keeps_tabs/"&gt;
+    Windows Update snoops on</em></ins></span> the <span 
class="removed"><del><strong>same malware would later be 
introduced</strong></del></span> <span 
class="inserted"><ins><em>user&lt;/a&gt;. &lt;a
+    
href="https://www.infoworld.com/article/2611451/microsoft-windows/a-look-at-the-black-underbelly-of-windows-8-1--blue-.html"&gt;
+    Windows 8.1 snoops on local searches&lt;/a&gt;. And there's a &lt;a
+    href="http://www.marketoracle.co.uk/Article40836.html"&gt; secret NSA
+    key</em></ins></span> in <span 
class="removed"><del><strong>MacOS.)&lt;/p&gt;&lt;/li&gt;</strong></del></span> 
<span class="inserted"><ins><em>Windows&lt;/a&gt;, whose functions we don't 
know.&lt;/p&gt;
+  &lt;/li&gt;</em></ins></span>
+&lt;/ul&gt;
+
+
+&lt;h3 id="jails"&gt;Microsoft Jails&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;ul&gt;
+  &lt;li&gt;</strong></del></span>
 
+<span class="inserted"><ins><em>&lt;ul class="blurbs"&gt;
+&lt;!-- INSERT microsoft-jail --&gt;
+  &lt;li id="M201706130"&gt;</em></ins></span>
+    &lt;p&gt;Windows 10 S <span class="removed"><del><strong>ought to be 
called Windows 10 J, for &ldquo;Jail&rdquo;:</strong></del></span> <span 
class="inserted"><ins><em>was a jail:</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="https://www.theguardian.com/technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison"&gt;only</strong></del></span>
+    <span 
class="inserted"><ins><em>href="https://www.theguardian.com/technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison"&gt;
+    only</em></ins></span> programs from the Windows Store <span 
class="removed"><del><strong>can</strong></del></span> <span 
class="inserted"><ins><em>could</em></ins></span> be
+       <span class="removed"><del><strong>downloaded</strong></del></span>
+    <span class="inserted"><ins><em>installed</em></ins></span> and <span 
class="removed"><del><strong>executed&lt;/a&gt;.&lt;/p&gt;
+
+       &lt;p&gt;If the history</strong></del></span> <span 
class="inserted"><ins><em>executed&lt;/a&gt;. It was however possible to &lt;a
+    
href="https://www.theverge.com/2017/6/13/15789998/microsoft-windows-10-s-upgrade-windows-10-pro-guide"&gt;
+    upgrade to Windows 10 Pro&lt;/a&gt;. The successor</em></ins></span> of 
<span class="removed"><del><strong>iOS as a jail</strong></del></span> <span 
class="inserted"><ins><em>Windows
+    10 S</em></ins></span> is <span class="removed"><del><strong>any 
indication,</strong></del></span> <span class="inserted"><ins><em>a special 
configuration of</em></ins></span> Windows 10 <span 
class="removed"><del><strong>J
+       will be no better.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>called &lt;a
+    
href="https://support.microsoft.com/en-gb/help/4020089/windows-10-in-s-mode-faq"&gt;
+    S mode&lt;/a&gt;. The major difference with Windows 10 S is that there is
+    an easy way to switch out of S mode.&lt;/p&gt;</em></ins></span>
        &lt;/li&gt;
 
-  &lt;li&gt;&lt;p&gt;&lt;a 
href="http://www.itworld.com/operating-systems/301057/microsoft-metro-app-store-lockdown"&gt;</strong></del></span>
 <span class="inserted"><ins><em>Update snoops on the user&lt;/a&gt;. &lt;a
-    
href="https://www.infoworld.com/article/2611451/microsoft-windows/a-look-at-the-black-underbelly-of-windows-8-1--blue-.html"&gt;</em></ins></span>
-    Windows <span class="removed"><del><strong>8</strong></del></span> <span 
class="inserted"><ins><em>8.1 snoops</em></ins></span> on <span 
class="removed"><del><strong>&ldquo;mobile devices&rdquo; 
is</strong></del></span> <span class="inserted"><ins><em>local 
searches&lt;/a&gt;. And there's</em></ins></span> a <span 
class="removed"><del><strong>jail&lt;/a&gt;: it censors the
-  user's choice of application 
programs.&lt;/p&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>&lt;a
-    href="http://www.marketoracle.co.uk/Article40836.html"&gt; secret NSA
-    key in Windows&lt;/a&gt;, whose functions we don't know.&lt;/p&gt;
+  <span class="removed"><del><strong>&lt;li&gt;&lt;p&gt;&lt;a 
href="http://www.itworld.com/operating-systems/301057/microsoft-metro-app-store-lockdown"&gt;</strong></del></span>
+
+  <span class="inserted"><ins><em>&lt;li id="M201210080"&gt;
+    &lt;p&gt;&lt;a
+    
href="http://www.itworld.com/article/2832657/operating-systems/microsoft-metro-app-store-lock-down.html"&gt;</em></ins></span>
+    Windows 8 on &ldquo;mobile devices&rdquo; <span 
class="removed"><del><strong>is</strong></del></span> <span 
class="inserted"><ins><em>(now defunct) was</em></ins></span> a <span 
class="removed"><del><strong>jail&lt;/a&gt;: it censors the
+  user's choice of application 
programs.&lt;/p&gt;&lt;/li&gt;</strong></del></span>
+    <span class="inserted"><ins><em>jail&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;</em></ins></span>
 &lt;/ul&gt;
 
@@ -775,7 +781,7 @@
 &lt;li&gt;</strong></del></span>
 
 <span class="inserted"><ins><em>&lt;ul class="blurbs"&gt;
-&lt;!-- INSERT tyrants --&gt;
+&lt;!-- INSERT microsoft-tyrant --&gt;
   &lt;li id="M201607150"&gt;</em></ins></span>
     &lt;p&gt;Microsoft accidentally left a way for users
     to install GNU/Linux on Windows RT tablets, but now it has &lt;a
@@ -858,7 +864,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2018/10/05 17:29:55 $
+$Date: 2018/10/07 19:58:31 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: malware-microsoft.it.po
===================================================================
RCS file: /web/www/www/proprietary/po/malware-microsoft.it.po,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- malware-microsoft.it.po     5 Oct 2018 17:29:56 -0000       1.127
+++ malware-microsoft.it.po     7 Oct 2018 19:58:31 -0000       1.128
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: malware-microsoft.html\n"
-"POT-Creation-Date: 2018-10-05 17:25+0000\n"
+"POT-Creation-Date: 2018-10-07 19:56+0000\n"
 "PO-Revision-Date: 2017-12-31 13:06+0100\n"
 "Last-Translator: Andrea Pescetti <address@hidden>\n"
 "Language-Team: Italian <address@hidden>\n"
@@ -66,7 +66,7 @@
 "sviluppatori, consapevoli dell'impossibilità da parte degli utenti di "
 "riparare eventuali funzionalità malevole, sono tentati ad imporne."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "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"
@@ -234,6 +234,16 @@
 "Windows 8 con TPM 2.0</a> a causa di potenziali backdoor nel chip TPM 2.0."
 
 #. type: Content of: <ul><li><p>
+msgid ""
+"Here is a suspicion that we can't prove, but is worth thinking about: <a "
+"href=\"https://web.archive.org/web/20150206003913/http://www.afr.com/p/";
+"technology/intel_chips_could_be_nsa_key_to_ymrhS1HS1633gCWKt5tFtI\"> "
+"Writable microcode for Intel and AMD microprocessors</a> may be a vehicle "
+"for the NSA to invade computers, with the help of Microsoft, say respected "
+"security experts."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
 # | [-<a
 # | 
href=\"http://www.computerworld.com/article/2500036/desktop-apps/microsoft--we-can-remotely-delete-windows-8-apps.html\";>-]Windows
 # | 8 also has a back door for {+<a
@@ -520,44 +530,6 @@
 "con altri utenti) uno sviluppatore per farlo."
 
 #. type: Content of: <h3>
-msgid "Microsoft Jails"
-msgstr "Prigioni di Microsoft"
-
-#. type: Content of: <ul><li><p>
-msgid ""
-"Windows 10 S was a jail: <a href=\"https://www.theguardian.com/";
-"technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\"> only "
-"programs from the Windows Store could be installed and executed</a>. It was "
-"however possible to <a href=\"https://www.theverge.com/2017/6/13/15789998/";
-"microsoft-windows-10-s-upgrade-windows-10-pro-guide\"> upgrade to Windows 10 "
-"Pro</a>. The successor of Windows 10 S is a special configuration of Windows "
-"10 called <a href=\"https://support.microsoft.com/en-gb/help/4020089/";
-"windows-10-in-s-mode-faq\"> S mode</a>. The major difference with Windows 10 "
-"S is that there is an easy way to switch out of S mode."
-msgstr ""
-
-#. type: Content of: <ul><li><p>
-# | <a
-# | 
[-href=\"http://www.itworld.com/operating-systems/301057/microsoft-metro-app-store-lockdown\";>-]
-# | 
{+href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-metro-app-store-lock-down.html\";>+}
-# | Windows 8 on &ldquo;mobile devices&rdquo; [-is-] {+(now defunct) was+} a
-# | [-jail</a>: it censors the user's choice of application programs.-]
-# | {+jail</a>.+}
-#, fuzzy
-#| msgid ""
-#| "<a href=\"http://www.itworld.com/operating-systems/301057/microsoft-metro-";
-#| "app-store-lockdown\"> Windows 8 on &ldquo;mobile devices&rdquo; is a "
-#| "jail</a>: it censors the user's choice of application programs."
-msgid ""
-"<a href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-";
-"metro-app-store-lock-down.html\"> Windows 8 on &ldquo;mobile devices&rdquo; "
-"(now defunct) was a jail</a>."
-msgstr ""
-"<a href=\"http://www.itworld.com/operating-systems/301057/microsoft-metro-";
-"app-store-lockdown\">Windows 8 sui &ldquo;dispositivi mobili&rdquo; è una "
-"prigione</a>: censura la scelta delle applicazioni da parte dell'utente."
-
-#. type: Content of: <h3>
 msgid "Microsoft Sabotage"
 msgstr "Sabotaggio di Microsoft"
 
@@ -1181,6 +1153,44 @@
 "a>, le cui funzioni sono a noi ignote."
 
 #. type: Content of: <h3>
+msgid "Microsoft Jails"
+msgstr "Prigioni di Microsoft"
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"Windows 10 S was a jail: <a href=\"https://www.theguardian.com/";
+"technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\"> only "
+"programs from the Windows Store could be installed and executed</a>. It was "
+"however possible to <a href=\"https://www.theverge.com/2017/6/13/15789998/";
+"microsoft-windows-10-s-upgrade-windows-10-pro-guide\"> upgrade to Windows 10 "
+"Pro</a>. The successor of Windows 10 S is a special configuration of Windows "
+"10 called <a href=\"https://support.microsoft.com/en-gb/help/4020089/";
+"windows-10-in-s-mode-faq\"> S mode</a>. The major difference with Windows 10 "
+"S is that there is an easy way to switch out of S mode."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
+# | <a
+# | 
[-href=\"http://www.itworld.com/operating-systems/301057/microsoft-metro-app-store-lockdown\";>-]
+# | 
{+href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-metro-app-store-lock-down.html\";>+}
+# | Windows 8 on &ldquo;mobile devices&rdquo; [-is-] {+(now defunct) was+} a
+# | [-jail</a>: it censors the user's choice of application programs.-]
+# | {+jail</a>.+}
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://www.itworld.com/operating-systems/301057/microsoft-metro-";
+#| "app-store-lockdown\"> Windows 8 on &ldquo;mobile devices&rdquo; is a "
+#| "jail</a>: it censors the user's choice of application programs."
+msgid ""
+"<a href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-";
+"metro-app-store-lock-down.html\"> Windows 8 on &ldquo;mobile devices&rdquo; "
+"(now defunct) was a jail</a>."
+msgstr ""
+"<a href=\"http://www.itworld.com/operating-systems/301057/microsoft-metro-";
+"app-store-lockdown\">Windows 8 sui &ldquo;dispositivi mobili&rdquo; è una "
+"prigione</a>: censura la scelta delle applicazioni da parte dell'utente."
+
+#. type: Content of: <h3>
 msgid "Microsoft Tyrants"
 msgstr "Tiranni di Microsoft"
 

Index: malware-microsoft.ja-diff.html
===================================================================
RCS file: /web/www/www/proprietary/po/malware-microsoft.ja-diff.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- malware-microsoft.ja-diff.html      5 Oct 2018 17:29:56 -0000       1.22
+++ malware-microsoft.ja-diff.html      7 Oct 2018 19:58:31 -0000       1.23
@@ -33,7 +33,7 @@
 &lt;p&gt;&lt;a href="/proprietary/proprietary.html"&gt;Other examples of 
proprietary
 malware&lt;/a&gt;&lt;/p&gt;
 
-&lt;div class="highlight-para"&gt;
+&lt;div <span 
class="removed"><del><strong>class="highlight-para"&gt;</strong></del></span> 
<span class="inserted"><ins><em>class="comment"&gt;</em></ins></span>
 &lt;p&gt;
 &lt;em&gt;Malware&lt;/em&gt; means software designed to function in ways that
 mistreat or harm the user.  (This does not include accidental errors.)
@@ -51,16 +51,18 @@
 because the developer's awareness that the users would be powerless to fix
 any malicious functionalities tempts the developer to impose some.
 &lt;/p&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
 
-<span class="inserted"><ins><em>&lt;p&gt;If you know of an example that ought 
to be in this page but isn't
+&lt;div <span 
class="removed"><del><strong>class="toc"&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="important" style="margin-bottom: 2em"&gt;
+&lt;p&gt;If you know of an example that ought to be in this page but isn't
 here, please write
 to &lt;a href="mailto:address@hidden"&gt;&lt;address@hidden&gt;&lt;/a&gt;
 to inform us. Please include the URL of a trustworthy reference or two
-to present the specifics.&lt;/p&gt;</em></ins></span>
+to present the specifics.&lt;/p&gt;
 &lt;/div&gt;
+&lt;/div&gt;</em></ins></span>
 
-&lt;div <span class="removed"><del><strong>class="toc"&gt;
-&lt;div class="malfunctions"&gt;</strong></del></span> <span 
class="inserted"><ins><em>class="summary" style="margin-top: 2em"&gt;
+&lt;div <span 
class="removed"><del><strong>class="malfunctions"&gt;</strong></del></span> 
<span class="inserted"><ins><em>class="summary"&gt;
 &lt;h3&gt;Type&nbsp;of malware&lt;/h3&gt;</em></ins></span>
 &lt;ul&gt;
 <span class="removed"><del><strong>&lt;li&gt;&lt;strong&gt;Type&nbsp;of 
malware&lt;/strong&gt;&lt;/li&gt;</strong></del></span>
@@ -95,7 +97,7 @@
   &lt;li&gt;&lt;p&gt;Microsoft</strong></del></span>
 
 <span class="inserted"><ins><em>&lt;ul class="blurbs"&gt;
-&lt;!-- INSERT backdoor --&gt;
+&lt;!-- INSERT microsoft-back-door --&gt;
   &lt;li id="M201608172"&gt;
     &lt;p id="windows-update"&gt;Microsoft</em></ins></span>
     Windows has a universal back door through which &lt;a <span 
class="removed"><del><strong>href="http://www.informationweek.com/news/showArticle.jhtml?articleID=201806263"&gt;</strong></del></span>
@@ -133,6 +135,15 @@
     door capabilities of the TPM 2.0 chip.&lt;/p&gt;
   &lt;/li&gt;
 
+  &lt;li id="M201307300"&gt;
+    &lt;p&gt;Here is a suspicion that
+    we can't prove, but is worth thinking about: &lt;a
+    
href="https://web.archive.org/web/20150206003913/http://www.afr.com/p/technology/intel_chips_could_be_nsa_key_to_ymrhS1HS1633gCWKt5tFtI"&gt;
+    Writable microcode for Intel and AMD microprocessors&lt;/a&gt; may be a
+    vehicle for the NSA to invade computers, with the help of Microsoft,
+    say respected security experts.&lt;/p&gt;
+  &lt;/li&gt;
+
   &lt;li id="M201112081"&gt;
     &lt;p&gt;Windows 8</em></ins></span> also has a back door for <span 
class="inserted"><ins><em>&lt;a
     
href="http://www.computerworld.com/article/2500036/desktop-apps/microsoft--we-can-remotely-delete-windows-8-apps.html"&gt;</em></ins></span>
@@ -161,7 +172,7 @@
 &lt;h3 id="drm"&gt;Microsoft DRM&lt;/h3&gt;
 
 &lt;ul class="blurbs"&gt;
-&lt;!-- INSERT DRM --&gt;
+&lt;!-- INSERT microsoft-dr --&gt;
   &lt;li id="M200708131"&gt;
     &lt;p&gt;&lt;a 
href="http://arstechnica.com/apple/2007/08/aacs-tentacles/"&gt;DRM</em></ins></span>
     in <span class="removed"><del><strong>fact &lt;a 
@@ -185,16 +196,15 @@
 &lt;h3 id="insecurity"&gt;Microsoft Insecurity&lt;/h3&gt;
 
 <span class="removed"><del><strong>&lt;ul&gt;
-    &lt;li&gt;&lt;p&gt;A &lt;a 
href="http://www.zdnet.com/article/windows-attack-can-steal-your-username-password-and-other-logins/"&gt;flaw
 in Internet Explorer and Edge&lt;/a&gt;
-    allows an attacker</strong></del></span>
+    &lt;li&gt;&lt;p&gt;A &lt;a 
href="http://www.zdnet.com/article/windows-attack-can-steal-your-username-password-and-other-logins/"&gt;flaw</strong></del></span>
 
 <span class="inserted"><ins><em>&lt;p&gt;These bugs are/were not intentional, 
so unlike the rest of the file
-  they do not count as malware. We mention them</em></ins></span> to <span 
class="removed"><del><strong>retrieve Microsoft account credentials, 
if</strong></del></span> <span class="inserted"><ins><em>refute the
+  they do not count as malware. We mention them to refute the
   supposition that prestigious proprietary software doesn't have grave
   bugs.&lt;/p&gt;
 
 &lt;ul class="blurbs"&gt;
-&lt;!-- INSERT insecurity --&gt;
+&lt;!-- INSERT microsoft-insec --&gt;
   &lt;li id="M201705120"&gt;
     &lt;p&gt;Exploits of bugs in Windows, which were developed by the NSA
     and then leaked by the Shadowbrokers group, are now being used to &lt;a
@@ -204,9 +214,9 @@
 
   &lt;li id="M201608020"&gt;
     &lt;p&gt;A &lt;a
-    
href="http://www.zdnet.com/article/windows-attack-can-steal-your-username-password-and-other-logins/"&gt;flaw
+    
href="http://www.zdnet.com/article/windows-attack-can-steal-your-username-password-and-other-logins/"&gt;flaw</em></ins></span>
     in Internet Explorer and Edge&lt;/a&gt; allows an attacker to retrieve
-    Microsoft account credentials, if</em></ins></span> the user is tricked 
into visiting
+    Microsoft account credentials, if the user is tricked into visiting
     a malicious link.&lt;/p&gt;
   &lt;/li&gt;
 <span class="removed"><del><strong>&lt;li&gt;</strong></del></span>
@@ -218,32 +228,40 @@
     turned into a botnet for the purpose of collecting customers' credit
     card
 <span class="removed"><del><strong>numbers&lt;/a&gt;.
-&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>numbers.&lt;/p&gt;
+&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>numbers.&lt;/p&gt;</em></ins></span>
   &lt;/li&gt;
 &lt;/ul&gt;
 
 
-&lt;h3 id="interference"&gt;Microsoft Interference&lt;/h3&gt;
+&lt;h3 <span class="removed"><del><strong>id="sabotage"&gt;Microsoft 
Sabotage&lt;/h3&gt;
+
+&lt;p&gt;The wrongs in this section are not precisely malware, since they do
+not involve making the program that runs in a way that 
hurts</strong></del></span> <span 
class="inserted"><ins><em>id="interference"&gt;Microsoft Interference&lt;/h3&gt;
 
-&lt;p&gt;Various proprietary programs often mess up the user's system. They
-are like sabotage, but they are not grave enough to qualify for the word
+&lt;p&gt;Various proprietary programs often mess up</em></ins></span> the 
<span class="removed"><del><strong>user.
+But they</strong></del></span> <span class="inserted"><ins><em>user's system. 
They</em></ins></span>
+are <span class="removed"><del><strong>a lot</strong></del></span> like <span 
class="removed"><del><strong>malware, since</strong></del></span> <span 
class="inserted"><ins><em>sabotage, but</em></ins></span> they are <span 
class="removed"><del><strong>technical Microsoft
+actions that harm</strong></del></span> <span class="inserted"><ins><em>not 
grave enough</em></ins></span> to <span class="inserted"><ins><em>qualify 
for</em></ins></span> the <span class="inserted"><ins><em>word
 &ldquo;sabotage&rdquo;. Nonetheless, they are nasty and wrong. This
 section describes examples of Microsoft committing interference.&lt;/p&gt;
 
 &lt;ul class="blurbs"&gt;
-&lt;!-- INSERT interference --&gt;
+&lt;!-- INSERT microsoft-interf --&gt;
   &lt;li id="M201809120"&gt;
     &lt;p&gt;One version of Windows 10 &lt;a
     
href="https://www.ghacks.net/2018/09/12/microsoft-intercepting-firefox-chrome-installation-on-windows-10/"&gt;
-    harangues users if they try to install Firefox (or 
Chrome)&lt;/a&gt;.&lt;/p&gt;
+    harangues</em></ins></span> users <span class="inserted"><ins><em>if they 
try to install Firefox (or Chrome)&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201803190"&gt;
     &lt;p&gt;Microsoft is planning to make Windows &lt;a
     
href="https://www.theguardian.com/technology/2018/mar/19/windows-10-microsoft-force-people-edge-browser-windows-mail-chrome-firefox"&gt;
-    impose use of its browser, Edge, in certain 
circumstances&lt;/a&gt;.&lt;/p&gt;
+    impose use</em></ins></span> of <span 
class="removed"><del><strong>specific</strong></del></span> <span 
class="inserted"><ins><em>its browser, Edge, in certain 
circumstances&lt;/a&gt;.&lt;/p&gt;
 
-    &lt;p&gt;The reason Microsoft can force things on users is that Windows
+    &lt;p&gt;The reason</em></ins></span> Microsoft <span 
class="removed"><del><strong>software.&lt;/p&gt;
+
+&lt;ul&gt;
+  &lt;li&gt;&lt;p&gt;Once</strong></del></span> <span 
class="inserted"><ins><em>can force things on users is that Windows
     is nonfree.&lt;/p&gt;
   &lt;/li&gt;
 
@@ -253,25 +271,32 @@
     intrusive ads for Microsoft products and its partners'
     products&lt;/a&gt;.&lt;/p&gt;
 
-    &lt;p&gt;The article's author starts from the premise that Microsoft has
-    a right to control what Windows does to users, as long as it doesn't
+    &lt;p&gt;The article's author starts from the premise 
that</em></ins></span> Microsoft has <span 
class="removed"><del><strong>tricked</strong></del></span>
+    a <span class="removed"><del><strong>user into accepting 
installation</strong></del></span> <span class="inserted"><ins><em>right to 
control what Windows does to users, as long as it doesn't
     go &ldquo;too far&rdquo;. We disagree.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201608170"&gt;
-    &lt;p&gt; After &lt;a 
href="/proprietary/malware-microsoft.html#windows10-forcing"&gt;forcing the 
download of Windows 10&lt;/a&gt;
-    on computers that were running Windows 7 and 8, Microsoft &lt;a
-    
href="http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html"&gt;
-    repeatedly switched on a flag that urged users to
-    &ldquo;upgrade&rdquo; to Windows 10&lt;/a&gt; when they had turned
-    it off, in the hope that some day they would fail to say no.
+    &lt;p&gt; After &lt;a 
href="/proprietary/malware-microsoft.html#windows10-forcing"&gt;forcing the 
download</em></ins></span> of Windows
+   <span class="removed"><del><strong>10,</strong></del></span> <span 
class="inserted"><ins><em>10&lt;/a&gt;
+    on computers that were running Windows 7 and 8, 
Microsoft</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.theregister.co.uk/2016/06/01/windows_10_nagware_no_way_out/"&gt;they
+   find</strong></del></span>
+    <span 
class="inserted"><ins><em>href="http://www.computerworld.com/article/3012278/microsoft-windows/microsoft-sets-stage-for-massive-windows-10-upgrade-strategy.html"&gt;
+    repeatedly switched on a flag</em></ins></span> that <span 
class="inserted"><ins><em>urged users to
+    &ldquo;upgrade&rdquo; to Windows 10&lt;/a&gt; when</em></ins></span> they 
<span class="removed"><del><strong>are denied</strong></del></span> <span 
class="inserted"><ins><em>had turned
+    it off, in</em></ins></span> the <span 
class="removed"><del><strong>option</strong></del></span> <span 
class="inserted"><ins><em>hope that some day they would fail</em></ins></span> 
to <span class="removed"><del><strong>cancel or even postpone the
+   imposed date</strong></del></span> <span class="inserted"><ins><em>say no.
     To do this, Microsoft used &lt;a
     
href="https://www.theregister.co.uk/2016/03/17/microsoft_windows_10_upgrade_gwx_vs_humanity/"&gt;
     malware techniques&lt;/a&gt;.&lt;/p&gt;
 
     &lt;p&gt;A detailed &lt;a
     
href="https://www.eff.org/deeplinks/2016/08/windows-10-microsoft-blatantly-disregards-user-choice-and-privacy-deep-dive"&gt;
-    analysis of Microsoft's scheme&lt;/a&gt; is available on the Electronic
+    analysis</em></ins></span> of <span 
class="removed"><del><strong>installation&lt;/a&gt;.
+   &lt;/p&gt;
+   &lt;p&gt;This demonstrates what we've said for years: using proprietary
+   software means letting someone have power over you, and you're
+   going</strong></del></span> <span class="inserted"><ins><em>Microsoft's 
scheme&lt;/a&gt; is available on the Electronic
     Frontier Foundation's website.&lt;/p&gt;
   &lt;/li&gt;
 
@@ -279,24 +304,28 @@
     &lt;p&gt;Microsoft has made companies'
     Windows machines managed by the company's sysadmins &lt;a
     
href="http://www.infoworld.com/article/3042397/microsoft-windows/admins-beware-domain-attached-pcs-are-sprouting-get-windows-10-ads.html"&gt;harangue
-    users to complain to the sysadmins about not &ldquo;upgrading&rdquo;
+    users</em></ins></span> to <span class="removed"><del><strong>get screwed 
sooner or later.&lt;/p&gt;&lt;/li&gt;
+
+  &lt;li&gt;&lt;p&gt;Microsoft</strong></del></span> <span 
class="inserted"><ins><em>complain to the sysadmins about not 
&ldquo;upgrading&rdquo;
     to Windows 10&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201601160"&gt;
-    &lt;p&gt;Microsoft has &lt;a
+    &lt;p&gt;Microsoft</em></ins></span> has &lt;a
     
href="http://www.theverge.com/2016/1/16/10780876/microsoft-windows-support-policy-new-processors-skylake"&gt;desupported
     all future Intel CPUs for Windows 7 and 8&lt;/a&gt;. Those
     machines will be stuck with the nastier Windows 10.  &lt;a
     
href="http://gizmodo.com/only-the-latest-version-of-windows-will-run-on-some-fut-1753545825"&gt;
-    AMD and Qualcomm CPUs, too&lt;/a&gt;.&lt;/p&gt;
+    AMD and Qualcomm CPUs, <span class="removed"><del><strong>too&lt;/a&gt;.
+  &lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>too&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
 
     &lt;p&gt;Of course, Windows 7 and 8 are unethical too, because they are
     proprietary software.  But this example of Microsoft's wielding its
-    power demonstrates the power it holds.&lt;/p&gt;
+    power demonstrates the power it <span class="removed"><del><strong>holds.
+  &lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>holds.&lt;/p&gt;</em></ins></span>
 
     &lt;p&gt;Free software developers also stop maintaining old versions of
-    their programs, but this is not unfair to users because the users of
+    their programs, but this is not unfair to <span 
class="removed"><del><strong>users because</strong></del></span> <span 
class="inserted"><ins><em>users because the users of
     free software have control over it.  If it is important enough to you,
     you and other users can hire someone to support the old version on
     your future platforms.&lt;/p&gt;
@@ -304,42 +333,15 @@
 &lt;/ul&gt;
 
 
-&lt;h3 id="jails"&gt;Microsoft Jails&lt;/h3&gt;
-
-&lt;ul class="blurbs"&gt;
-&lt;!-- INSERT jails --&gt;
-  &lt;li id="M201706130"&gt;
-    &lt;p&gt;Windows 10 S was a jail: &lt;a
-    
href="https://www.theguardian.com/technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison"&gt;
-    only programs from the Windows Store could be
-    installed and executed&lt;/a&gt;. It was however possible to &lt;a
-    
href="https://www.theverge.com/2017/6/13/15789998/microsoft-windows-10-s-upgrade-windows-10-pro-guide"&gt;
-    upgrade to Windows 10 Pro&lt;/a&gt;. The successor of Windows
-    10 S is a special configuration of Windows 10 called &lt;a
-    
href="https://support.microsoft.com/en-gb/help/4020089/windows-10-in-s-mode-faq"&gt;
-    S mode&lt;/a&gt;. The major difference with Windows 10 S is that there is
-    an easy way to switch out of S mode.&lt;/p&gt;
-  &lt;/li&gt;
-
-  &lt;li id="M201210080"&gt;
-    &lt;p&gt;&lt;a
-    
href="http://www.itworld.com/article/2832657/operating-systems/microsoft-metro-app-store-lock-down.html"&gt;
-    Windows 8 on &ldquo;mobile devices&rdquo; (now defunct) was a
-    jail&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
-  &lt;/li&gt;
-&lt;/ul&gt;
-
-
 &lt;h3 id="sabotage"&gt;Microsoft Sabotage&lt;/h3&gt;
 
 &lt;p&gt;The wrongs in this section are not precisely malware, since they do
 not involve making the program that runs in a way that hurts the user.
 But they are a lot like malware, since they are technical Microsoft
-<span class="removed"><del><strong>actions that harm</strong></del></span>
-<span class="inserted"><ins><em>actions that harm the users of specific 
Microsoft software.&lt;/p&gt;
+actions that harm the users of specific Microsoft software.&lt;/p&gt;
 
 &lt;ul class="blurbs"&gt;
-&lt;!-- INSERT sabotage --&gt;
+&lt;!-- INSERT microsoft-sab --&gt;
   &lt;li id="M201704194"&gt;
     &lt;p&gt;Microsoft has made Windows 7
     and 8 cease to function on certain new computers, &lt;a
@@ -354,17 +356,14 @@
     in a big hurry.&lt;/p&gt;
 
     &lt;p&gt;It makes no difference what legitimate reasons Microsoft might
-    have for not doing work to support them. If it doesn't 
want</em></ins></span> to <span class="inserted"><ins><em>do
-    this work, it should let users do</em></ins></span> the <span 
class="inserted"><ins><em>work.&lt;/p&gt;
+    have for not doing work to support them. If it doesn't want to do
+    this work, it should let users do the work.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201606270"&gt;
-    &lt;p id="windows10-forcing"&gt;In its efforts to trick</em></ins></span> 
users of <span class="removed"><del><strong>specific</strong></del></span> 
<span class="inserted"><ins><em>Windows
+    &lt;p id="windows10-forcing"&gt;In its efforts to trick users of Windows
     7 and 8 into installing all-spying Windows 10 against their
-    will,</em></ins></span> Microsoft <span 
class="removed"><del><strong>software.&lt;/p&gt;
-
-&lt;ul&gt;
-  &lt;li&gt;&lt;p&gt;Once</strong></del></span> <span 
class="inserted"><ins><em>forced their computers to &lt;a
+    will, Microsoft forced their computers to &lt;a
     
href="https://www.theguardian.com/technology/2015/sep/11/microsoft-downloading-windows-1"&gt;
     silently download&hellip; the whole of Windows 10&lt;/a&gt;! Apparently,
     this was done through a &lt;a
@@ -378,49 +377,45 @@
   &lt;/li&gt;
 
   &lt;li id="M201606010"&gt;
-    &lt;p&gt;Once</em></ins></span> Microsoft has tricked a user
-    into accepting installation of Windows 10, &lt;a <span 
class="removed"><del><strong>href="http://www.theregister.co.uk/2016/06/01/windows_10_nagware_no_way_out/"&gt;they</strong></del></span>
-    <span 
class="inserted"><ins><em>href="https://www.theregister.co.uk/2016/06/01/windows_10_nagware_no_way_out/"&gt;they</em></ins></span>
-    find that they are denied the option to cancel or even postpone the
-    imposed date of <span class="removed"><del><strong>installation&lt;/a&gt;.
-   &lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>installation&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
-
-    &lt;p&gt;This demonstrates what we've said for years: using proprietary
-    software means letting someone have power over you, and you're going
-    to get screwed sooner or <span 
class="removed"><del><strong>later.&lt;/p&gt;&lt;/li&gt;
-
-  &lt;li&gt;&lt;p&gt;Microsoft
-  has &lt;a 
href="http://www.theverge.com/2016/1/16/10780876/microsoft-windows-support-policy-new-processors-skylake"&gt;desupported
-  all future Intel CPUs for Windows 7 and 8&lt;/a&gt;. Those machines will
-  be stuck with the nastier Windows 10.
-  &lt;a 
href="http://gizmodo.com/only-the-latest-version-of-windows-will-run-on-some-fut-1753545825"&gt;
-  AMD and Qualcomm CPUs, too&lt;/a&gt;.
-  &lt;/p&gt;
-  &lt;p&gt;Of course, Windows 7 and 8 are unethical too, because they 
are</strong></del></span> <span class="inserted"><ins><em>later.&lt;/p&gt;
-  &lt;/li&gt;
-
-  &lt;li id="M201601310"&gt;
-    &lt;p&gt;FTDI's</em></ins></span> proprietary <span 
class="removed"><del><strong>software.  But this example of Microsoft's 
wielding its
-  power demonstrates the power it holds.
-  &lt;/p&gt;
-  &lt;p&gt;Free software developers also stop maintaining old versions of
-  their programs, but this is not unfair to users because the
-  users of free software have control over it.  If it is important
-  enough to you, you and other users can hire someone to support
+    &lt;p&gt;Once Microsoft has tricked a user
+    into accepting installation of Windows 10, &lt;a
+    
href="https://www.theregister.co.uk/2016/06/01/windows_10_nagware_no_way_out/"&gt;they
+    find that they are denied the option to cancel or even 
postpone</em></ins></span> the
+  <span class="removed"><del><strong>users</strong></del></span>
+    <span class="inserted"><ins><em>imposed date</em></ins></span> of <span 
class="removed"><del><strong>free</strong></del></span> <span 
class="inserted"><ins><em>installation&lt;/a&gt;.&lt;/p&gt;
+
+    &lt;p&gt;This demonstrates what we've said for years: using 
proprietary</em></ins></span>
+    software <span class="inserted"><ins><em>means letting 
someone</em></ins></span> have <span 
class="removed"><del><strong>control</strong></del></span> <span 
class="inserted"><ins><em>power</em></ins></span> over <span 
class="removed"><del><strong>it.  If it is important
+  enough to</strong></del></span> you, <span 
class="removed"><del><strong>you</strong></del></span> and <span 
class="removed"><del><strong>other users can hire someone to support
   the old version on your future platforms.
   &lt;/p&gt;&lt;/li&gt;
 
   &lt;li&gt;&lt;p&gt;Microsoft
     is &lt;a 
href="http://gizmodo.com/woman-wins-10-000-from-microsoft-after-unwanted-window-1782666146"&gt;
     forcibly pushing Windows
-    update to its version 10&lt;/a&gt;, ignoring the flag on Windows 7 or 8
-    that you could set to not upgrade.  This reaffirms the presence of
-    a &lt;a href="/proprietary/proprietary-back-doors.html"&gt;universal
+    update</strong></del></span> <span class="inserted"><ins><em>you're 
going</em></ins></span>
+    to <span class="removed"><del><strong>its version 10&lt;/a&gt;, ignoring 
the flag on Windows 7</strong></del></span> <span class="inserted"><ins><em>get 
screwed sooner</em></ins></span> or <span class="removed"><del><strong>8
+    that you could set</strong></del></span> <span 
class="inserted"><ins><em>later.&lt;/p&gt;
+  &lt;/li&gt;
+
+  &lt;li id="M201601310"&gt;
+    &lt;p&gt;FTDI's proprietary driver
+    for its USB-to-serial chips has been designed</em></ins></span> to <span 
class="removed"><del><strong>not upgrade.  This reaffirms the presence of
+    a</strong></del></span> &lt;a <span 
class="removed"><del><strong>href="/proprietary/proprietary-back-doors.html"&gt;universal
     back door in Windows&lt;/a&gt; 7 and 8.&lt;/p&gt;&lt;/li&gt;
 
-  &lt;li&gt;&lt;p&gt;Windows 10 &ldquo;upgrades&rdquo; &lt;a
+  &lt;li&gt;&lt;p&gt;Windows</strong></del></span>
+    <span 
class="inserted"><ins><em>href="http://arstechnica.com/information-technology/2014/10/windows-update-drivers-bricking-usb-serial-chips-beloved-of-hardware-hackers/"&gt;sabotage
+    alternative compatible chips&lt;/a&gt;
+    so that they no longer work. Microsoft is &lt;a
+    
href="http://it.slashdot.org/story/16/01/31/1720259/ftdi-driver-breaks-hardware-again"&gt;installing
+    this automatically&lt;/a&gt; as an &ldquo;upgrade&rdquo;.&lt;/p&gt;
+  &lt;/li&gt;
+
+  &lt;li id="M201511240"&gt;
+    &lt;p&gt;Windows</em></ins></span> 10 &ldquo;upgrades&rdquo; &lt;a
       
href="http://www.ghacks.net/2015/11/24/beware-latest-windows-10-update-may-remove-programs-automatically/"&gt;
-      delete applications&lt;/a&gt; without asking 
permission.&lt;/p&gt;&lt;/li&gt;
+    delete applications&lt;/a&gt; without asking <span 
class="removed"><del><strong>permission.&lt;/p&gt;&lt;/li&gt;
 
   &lt;li&gt;&lt;p&gt;
   Microsoft is &lt;a 
href="http://www.theguardian.com/technology/2015/sep/11/microsoft-downloading-windows-1"&gt;
@@ -428,8 +423,7 @@
   &lt;/p&gt;&lt;/li&gt;
 
 &lt;li&gt;&lt;p&gt;
-Microsoft was</strong></del></span> <span 
class="inserted"><ins><em>driver</em></ins></span>
-    for <span class="removed"><del><strong>months &lt;a
+Microsoft was for months &lt;a
 
href="http://www.theguardian.com/technology/2016/feb/02/microsoft-downloading-windows-10-automatic-update"&gt;
 tricking users into &ldquo;upgrading&rdquo; to Windows 10&lt;/a&gt;, if they
 failed to notice and say no.
@@ -439,18 +433,8 @@
 
href="https://web.archive.org/web/20130622044225/http://blogs.computerworlduk.com/open-enterprise/2013/06/how-can-any-company-ever-trust-microsoft-again/index.htm"&gt;
   Microsoft informs the NSA of bugs in Windows before fixing 
them.&lt;/a&gt;&lt;/p&gt;&lt;/li&gt;
 
-  &lt;li&gt;&lt;p&gt;&lt;a 
href="http://www.computerworlduk.com/blogs/open-enterprise/windows-xp-end-of-an-era-end-of-an-error-3569489/"&gt;</strong></del></span>
 <span class="inserted"><ins><em>its USB-to-serial chips has been designed to 
&lt;a
-    
href="http://arstechnica.com/information-technology/2014/10/windows-update-drivers-bricking-usb-serial-chips-beloved-of-hardware-hackers/"&gt;sabotage
-    alternative compatible chips&lt;/a&gt;
-    so that they no longer work.</em></ins></span> Microsoft <span 
class="inserted"><ins><em>is &lt;a
-    
href="http://it.slashdot.org/story/16/01/31/1720259/ftdi-driver-breaks-hardware-again"&gt;installing
-    this automatically&lt;/a&gt; as an &ldquo;upgrade&rdquo;.&lt;/p&gt;
-  &lt;/li&gt;
-
-  &lt;li id="M201511240"&gt;
-    &lt;p&gt;Windows 10 &ldquo;upgrades&rdquo; &lt;a
-    
href="http://www.ghacks.net/2015/11/24/beware-latest-windows-10-update-may-remove-programs-automatically/"&gt;
-    delete applications&lt;/a&gt; without asking permission.&lt;/p&gt;
+  &lt;li&gt;&lt;p&gt;&lt;a 
href="http://www.computerworlduk.com/blogs/open-enterprise/windows-xp-end-of-an-era-end-of-an-error-3569489/"&gt;
+  Microsoft</strong></del></span> <span 
class="inserted"><ins><em>permission.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201503260"&gt;
@@ -480,14 +464,20 @@
 
 &lt;h3 <span class="removed"><del><strong>id="interference"&gt;Microsoft 
Interference&lt;/h3&gt;
 
-&lt;p&gt;Various proprietary programs often mess up</strong></del></span> 
<span class="inserted"><ins><em>id="subscriptions"&gt;Microsoft 
Subscriptions&lt;/h3&gt;
+&lt;p&gt;Various proprietary programs often mess up the user's system. They 
are like sabotage, but they are not grave enough</strong></del></span> <span 
class="inserted"><ins><em>id="subscriptions"&gt;Microsoft 
Subscriptions&lt;/h3&gt;
 
 &lt;ul class="blurbs"&gt;
-&lt;!-- INSERT subscriptions --&gt;
+&lt;!-- INSERT microsoft-subscript --&gt;
   &lt;li id="M201507150"&gt;
     &lt;p&gt;Microsoft Office forces users &lt;a
     
href="https://www.computerworld.com/article/2948755/windows-apps/office-for-windows-10-will-require-office-365-subscription-on-pcs-larger-tablets.html"&gt;to
-    subscribe to Office 365 to be able to create/edit 
documents&lt;/a&gt;.&lt;/p&gt;
+    subscribe</em></ins></span> to <span class="removed"><del><strong>qualify 
+for the word &ldquo;sabotage&rdquo;. Nonetheless, they are nasty and wrong. 
This section describes examples of Microsoft committing
+interference.&lt;/p&gt;
+
+&lt;ul&gt;
+
+&lt;li&gt;In order</strong></del></span> <span 
class="inserted"><ins><em>Office 365 to be able to create/edit 
documents&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;
 &lt;/ul&gt;
 
@@ -497,59 +487,53 @@
 &lt;ul class="blurbs"&gt;
 &lt;!-- INSERT microsoft-surv --&gt;
   &lt;li id="M201710134"&gt;
-    &lt;p&gt;Windows 10 telemetry program sends information to Microsoft 
about</em></ins></span>
-    the user's <span class="removed"><del><strong>system. They are like 
sabotage, but they are not grave enough to qualify</strong></del></span> <span 
class="inserted"><ins><em>computer and their use of the computer.&lt;/p&gt;
-
-    &lt;p&gt;Furthermore,</em></ins></span> for <span 
class="inserted"><ins><em>users who installed</em></ins></span> the <span 
class="removed"><del><strong>word &ldquo;sabotage&rdquo;. Nonetheless, they are 
nasty and wrong. This section describes examples</strong></del></span>
-    <span class="inserted"><ins><em>fourth stable build</em></ins></span> of 
<span class="removed"><del><strong>Microsoft committing
-interference.&lt;/p&gt;
-
-&lt;ul&gt;
-
-&lt;li&gt;In order to increase</strong></del></span> Windows <span 
class="removed"><del><strong>10's install base, Microsoft
-&lt;a
+    &lt;p&gt;Windows 10 telemetry program sends information</em></ins></span> 
to <span class="removed"><del><strong>increase Windows 10's install 
base,</strong></del></span> Microsoft
+<span class="removed"><del><strong>&lt;a
 
href="https://www.eff.org/deeplinks/2016/08/windows-10-microsoft-blatantly-disregards-user-choice-and-privacy-deep-dive"&gt;
-blatantly disregards user choice and privacy&lt;/a&gt;.
+blatantly disregards user choice</strong></del></span> <span 
class="inserted"><ins><em>about
+    the user's computer</em></ins></span> and <span 
class="removed"><del><strong>privacy&lt;/a&gt;.
 &lt;/li&gt;
 
 &lt;li&gt;&lt;p&gt;Microsoft has
-started &lt;a 
href="https://www.theguardian.com/technology/2016/jul/04/microsoft-windows-10-full-screen-upgrade-notification-pop-up-reminder"&gt;nagging
-users obnoxiously and repeatedly to install</strong></del></span> <span 
class="inserted"><ins><em>10, called the
-    &ldquo;Creators Update,&rdquo;</em></ins></span> Windows <span 
class="removed"><del><strong>10&lt;/a&gt;.&lt;/p&gt;&lt;/li&gt;
+started &lt;a 
href="https://www.theguardian.com/technology/2016/jul/04/microsoft-windows-10-full-screen-upgrade-notification-pop-up-reminder"&gt;nagging</strong></del></span>
 <span class="inserted"><ins><em>their use of the computer.&lt;/p&gt;
+
+    &lt;p&gt;Furthermore, for</em></ins></span> users <span 
class="removed"><del><strong>obnoxiously and repeatedly to install Windows 
10&lt;/a&gt;.&lt;/p&gt;&lt;/li&gt;
 
   &lt;li&gt;&lt;p&gt;Microsoft
       &lt;a 
href="http://news.softpedia.com/news/windows-10-upgrade-reportedly-starting-automatically-on-windows-7-pcs-501651.shtml"&gt;is
         tricking
-        users&lt;/a&gt;</strong></del></span> <span 
class="inserted"><ins><em>maximized the surveillance</em></ins></span> &lt;a
-<span 
class="removed"><del><strong>href="https://web.archive.org/web/20160522062607/http://www.theregister.co.uk/2016/03/17/microsoft_windows_10_upgrade_gwx_vs_humanity/"&gt;
-into replacing Windows 7 with Windows 10&lt;/a&gt;.&lt;/p&gt;&lt;/li&gt;
-
-  &lt;li&gt;&lt;p&gt;Microsoft has made companies' Windows machines 
managed</strong></del></span>
-    <span 
class="inserted"><ins><em>href="https://arstechnica.com/gadgets/2017/10/dutch-privacy-regulator-says-that-windows-10-breaks-the-law"&gt;</em></ins></span>
-    by <span class="inserted"><ins><em>force setting</em></ins></span> the
+        users&lt;/a&gt; &lt;a
+href="https://web.archive.org/web/20160522062607/http://www.theregister.co.uk/2016/03/17/microsoft_windows_10_upgrade_gwx_vs_humanity/"&gt;
+into replacing Windows 7 with</strong></del></span> <span 
class="inserted"><ins><em>who installed the
+    fourth stable build of</em></ins></span> Windows <span 
class="removed"><del><strong>10&lt;/a&gt;.&lt;/p&gt;&lt;/li&gt;
+
+  &lt;li&gt;&lt;p&gt;Microsoft has made companies'</strong></del></span> <span 
class="inserted"><ins><em>10, called the
+    &ldquo;Creators Update,&rdquo;</em></ins></span> Windows <span 
class="removed"><del><strong>machines managed by</strong></del></span> <span 
class="inserted"><ins><em>maximized</em></ins></span> the
 <span class="removed"><del><strong>company's
-sysadmins &lt;a 
href="http://www.infoworld.com/article/3042397/microsoft-windows/admins-beware-domain-attached-pcs-are-sprouting-get-windows-10-ads.html"&gt;harangue
-users</strong></del></span> <span class="inserted"><ins><em>telemetry 
mode</em></ins></span> to <span 
class="removed"><del><strong>complain</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Full&rdquo;&lt;/a&gt;.&lt;/p&gt;
+sysadmins</strong></del></span> <span 
class="inserted"><ins><em>surveillance</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.infoworld.com/article/3042397/microsoft-windows/admins-beware-domain-attached-pcs-are-sprouting-get-windows-10-ads.html"&gt;harangue
+users to complain to</strong></del></span>
+    <span 
class="inserted"><ins><em>href="https://arstechnica.com/gadgets/2017/10/dutch-privacy-regulator-says-that-windows-10-breaks-the-law"&gt;
+    by force setting</em></ins></span> the <span 
class="removed"><del><strong>sysadmins about not 
&ldquo;upgrading&rdquo;</strong></del></span> <span 
class="inserted"><ins><em>telemetry mode</em></ins></span> to <span 
class="inserted"><ins><em>&ldquo;Full&rdquo;&lt;/a&gt;.&lt;/p&gt;
 
     &lt;p&gt;The &lt;a
     
href="https://docs.microsoft.com/en-us/windows/privacy/configure-windows-diagnostic-data-in-your-organization#full-level"&gt;
-    &ldquo;Full&rdquo; telemetry mode&lt;/a&gt; allows Microsoft Windows
-    engineers</em></ins></span> to <span class="removed"><del><strong>the 
sysadmins about not &ldquo;upgrading&rdquo;</strong></del></span> <span 
class="inserted"><ins><em>access, among other things, registry keys &lt;a
-    href="https://technet.microsoft.com/en-us/library/cc939702.aspx"&gt;which
-    can contain sensitive information like administrator's login
-    password&lt;/a&gt;.&lt;/p&gt;
-  &lt;/li&gt;
-
-  &lt;li id="M201702020"&gt;
-    &lt;p&gt;DRM-restricted files can be used</em></ins></span> to <span 
class="removed"><del><strong>Windows
-10&lt;/a&gt;.&lt;/p&gt;&lt;/li&gt;
+    &ldquo;Full&rdquo; telemetry mode&lt;/a&gt; allows 
Microsoft</em></ins></span> Windows
+<span class="removed"><del><strong>10&lt;/a&gt;.&lt;/p&gt;&lt;/li&gt;
 &lt;/ul&gt;
 
 &lt;h3 id="surveillance"&gt;Microsoft Surveillance&lt;/h3&gt;
 
 &lt;ul&gt;
 
-&lt;li&gt;&lt;p&gt;By</strong></del></span> <span 
class="inserted"><ins><em>&lt;a
+&lt;li&gt;&lt;p&gt;By</strong></del></span>
+    <span class="inserted"><ins><em>engineers to access, among other things, 
registry keys &lt;a
+    href="https://technet.microsoft.com/en-us/library/cc939702.aspx"&gt;which
+    can contain sensitive information like administrator's login
+    password&lt;/a&gt;.&lt;/p&gt;
+  &lt;/li&gt;
+
+  &lt;li id="M201702020"&gt;
+    &lt;p&gt;DRM-restricted files can be used to &lt;a
     
href="https://yro.slashdot.org/story/17/02/02/231229/windows-drm-protected-files-used-to-decloak-tor-browser-users"&gt;
     identify people browsing through Tor&lt;/a&gt;. The vulnerability exists
     only if you use Windows.&lt;/p&gt;
@@ -593,47 +577,38 @@
     program.  Users noticed this and complained, so Microsoft renamed it &lt;a
 <span 
class="removed"><del><strong>href="https://web.archive.org/web/20160407082751/http://www.theregister.co.uk/2015/11/26/microsoft_renamed_data_slurper_reinserted_windows_10/"&gt;</strong></del></span>
     <span 
class="inserted"><ins><em>href="https://www.theregister.co.uk/2015/11/26/microsoft_renamed_data_slurper_reinserted_windows_10/"&gt;</em></ins></span>
-    to give users the impression it was <span 
class="removed"><del><strong>gone&lt;/a&gt;.&lt;/p&gt;
+    to give users the impression it was gone&lt;/a&gt;.&lt;/p&gt;
 
-&lt;p&gt;To use proprietary software is to invite such 
treatment.&lt;/p&gt;&lt;/li&gt;
+    &lt;p&gt;To use proprietary software is to invite such <span 
class="removed"><del><strong>treatment.&lt;/p&gt;&lt;/li&gt;
 
   &lt;li&gt;&lt;p&gt;
   &lt;a 
href="https://duo.com/blog/bring-your-own-dilemma-oem-laptops-and-windows-10-security"&gt;
   Windows 10 comes with 13 screens of snooping options&lt;/a&gt;, all enabled 
by default,
-  and turning them off would be daunting</strong></del></span> <span 
class="inserted"><ins><em>gone&lt;/a&gt;.&lt;/p&gt;
+  and turning them off would be daunting to most users.&lt;/p&gt;&lt;/li&gt;
 
-    &lt;p&gt;To use proprietary software is</em></ins></span> to <span 
class="removed"><del><strong>most users.&lt;/p&gt;&lt;/li&gt;
+  &lt;li&gt;&lt;p&gt;
+  Windows 10 &lt;a 
href="https://web.archive.org/web/20151001035410/https://jonathan.porta.codes/2015/07/30/windows-10-seems-to-have-some-scary-privacy-defaults/"&gt;
+  ships with default settings that show no regard for the
+  privacy of its users&lt;/a&gt;, giving Microsoft the &ldquo;right&rdquo;
+  to snoop on the users' files, text input, voice input,
+  location info, contacts, calendar records and web browsing
+  history, as well as automatically connecting the machines to open
+  hotspots and showing targeted ads.&lt;/p&gt;
+
+  &lt;p&gt;We can suppose Microsoft look at users' files for the US government 
on
+  demand, though the &ldquo;privacy policy&rdquo; does not explicit say so. 
Will it
+  look at users' files for the Chinese government on 
demand?&lt;/p&gt;&lt;/li&gt;
 
-  &lt;li&gt;&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>invite such treatment.&lt;/p&gt;
+  &lt;li&gt;&lt;p&gt;
+  &lt;a</strong></del></span> <span 
class="inserted"><ins><em>treatment.&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li id="M201508130"&gt;
-    &lt;p&gt;&lt;a
-    
href="http://arstechnica.com/information-technology/2015/08/even-when-told-not-to-windows-10-just-cant-stop-talking-to-microsoft/"&gt;</em></ins></span>
-    Windows 10 <span class="inserted"><ins><em>sends identifiable information 
to Microsoft&lt;/a&gt;, even if
+    &lt;p&gt;&lt;a</em></ins></span>
+    
href="http://arstechnica.com/information-technology/2015/08/even-when-told-not-to-windows-10-just-cant-stop-talking-to-microsoft/"&gt;
+    Windows 10 sends identifiable information to Microsoft&lt;/a&gt;, even if
     a user turns off its Bing search and Cortana features, and activates
-    the privacy-protection settings.&lt;/p&gt;
-  &lt;/li&gt;
-
-  &lt;li id="M201507300"&gt;
-    &lt;p&gt;Windows 10</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="https://web.archive.org/web/20151001035410/https://jonathan.porta.codes/2015/07/30/windows-10-seems-to-have-some-scary-privacy-defaults/"&gt;</strong></del></span>
-    <span 
class="inserted"><ins><em>href="https://jonathan.porta.codes/2015/07/30/windows-10-seems-to-have-some-scary-privacy-defaults/"&gt;</em></ins></span>
-    ships with default settings that show no regard for the privacy of
-    its users&lt;/a&gt;, giving Microsoft the &ldquo;right&rdquo; to snoop on
-    the users' files, text input, voice input, location info, contacts,
-    calendar records and web browsing history, as well as automatically
-    connecting the machines to open hotspots and showing targeted 
ads.&lt;/p&gt;
-
-    &lt;p&gt;We can suppose Microsoft look at users' files for the US 
government
-    on demand, though the &ldquo;privacy policy&rdquo; does not <span 
class="removed"><del><strong>explicit</strong></del></span> <span 
class="inserted"><ins><em>explicitly</em></ins></span>
-    say so. Will it look at users' files for the Chinese government
-    on <span class="removed"><del><strong>demand?&lt;/p&gt;&lt;/li&gt;
-
-  &lt;li&gt;&lt;p&gt;
-  &lt;a 
href="http://arstechnica.com/information-technology/2015/08/even-when-told-not-to-windows-10-just-cant-stop-talking-to-microsoft/"&gt;
-  Windows 10 sends identifiable information to Microsoft&lt;/a&gt;, even if a 
user
-  turns off its Bing search and Cortana features, and activates the
-  privacy-protection settings.&lt;/p&gt;&lt;/li&gt;
+    the privacy-protection <span 
class="removed"><del><strong>settings.&lt;/p&gt;&lt;/li&gt;
 
   &lt;li&gt;&lt;p&gt;The unique &ldquo;advertising ID&rdquo; for each user 
enables other companies to
   track the browsing of each specific user.&lt;/p&gt;&lt;/li&gt;
@@ -645,17 +620,29 @@
   &lt;a href="http://www.marketoracle.co.uk/Article40836.html"&gt;
   secret NSA key in Windows&lt;/a&gt;, whose functions we don't 
know.&lt;/li&gt;
 
-  &lt;li&gt;&lt;p&gt;
-  &lt;a 
href="http://www.itproportal.com/2014/05/14/microsoft-openly-offered-cloud-data-fbi-and-nsa/"&gt;
-  Microsoft SkyDrive allows the NSA to directly examine users' 
data.&lt;/a&gt;&lt;/p&gt;
+  &lt;li&gt;&lt;p&gt;</strong></del></span> <span 
class="inserted"><ins><em>settings.&lt;/p&gt;
+  &lt;/li&gt;
+
+  &lt;li id="M201507300"&gt;
+    &lt;p&gt;Windows 10</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.itproportal.com/2014/05/14/microsoft-openly-offered-cloud-data-fbi-and-nsa/"&gt;</strong></del></span>
+    <span 
class="inserted"><ins><em>href="https://jonathan.porta.codes/2015/07/30/windows-10-seems-to-have-some-scary-privacy-defaults/"&gt;
+    ships with default settings that show no regard for the privacy of
+    its users&lt;/a&gt;, giving</em></ins></span> Microsoft <span 
class="removed"><del><strong>SkyDrive allows</strong></del></span> the <span 
class="removed"><del><strong>NSA</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;right&rdquo;</em></ins></span> to <span 
class="removed"><del><strong>directly examine</strong></del></span> <span 
class="inserted"><ins><em>snoop on
+    the</em></ins></span> users' <span 
class="removed"><del><strong>data.&lt;/a&gt;&lt;/p&gt;
   &lt;/li&gt;
 
   &lt;li&gt;&lt;p&gt;Spyware in Skype:
       &lt;a 
href="http://www.forbes.com/sites/petercohan/2013/06/20/project-chess-how-u-s-snoops-on-your-skype/"&gt;
-      
http://www.forbes.com/sites/petercohan/2013/06/20/project-chess-how-u-s-snoops-on-your-skype/&lt;/a&gt;.
-      Microsoft changed Skype
+      
http://www.forbes.com/sites/petercohan/2013/06/20/project-chess-how-u-s-snoops-on-your-skype/&lt;/a&gt;.</strong></del></span>
 <span class="inserted"><ins><em>files, text input, voice input, location info, 
contacts,
+    calendar records and web browsing history, as well as automatically
+    connecting the machines to open hotspots and showing targeted 
ads.&lt;/p&gt;
+
+    &lt;p&gt;We can suppose</em></ins></span> Microsoft <span 
class="removed"><del><strong>changed Skype
       &lt;a 
href="http://www.guardian.co.uk/world/2013/jul/11/microsoft-nsa-collaboration-user-data"&gt;
-      specifically for spying&lt;/a&gt;.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>demand?&lt;/p&gt;</em></ins></span>
+      specifically</strong></del></span> <span class="inserted"><ins><em>look 
at users' files</em></ins></span> for <span 
class="removed"><del><strong>spying&lt;/a&gt;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>the US government
+    on demand, though the &ldquo;privacy policy&rdquo; does not explicitly
+    say so. Will it look at users' files for the Chinese government
+    on demand?&lt;/p&gt;</em></ins></span>
   &lt;/li&gt;
 
   <span class="removed"><del><strong>&lt;li&gt;&lt;p&gt;
@@ -709,7 +696,7 @@
 
   &lt;li id="M201307110"&gt;
     &lt;p&gt;Skype contains</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/proprietary/proprietary-drm.html#bluray"&gt;Bluray&lt;/a&gt;
 disks.
-  (The article also talks about how the same malware would later be 
introduced</strong></del></span>
+  (The article also talks about how</strong></del></span>
     <span 
class="inserted"><ins><em>href="https://web.archive.org/web/20130928235637/http://www.forbes.com/sites/petercohan/2013/06/20/project-chess-how-u-s-snoops-on-your-skype/"&gt;spyware&lt;/a&gt;.
     Microsoft changed Skype &lt;a
     
href="http://www.guardian.co.uk/world/2013/jul/11/microsoft-nsa-collaboration-user-data"&gt;
@@ -717,19 +704,42 @@
   &lt;/li&gt;
 
   &lt;li id="M201307080"&gt;
-    &lt;p&gt;Spyware</em></ins></span> in <span 
class="removed"><del><strong>MacOS.)&lt;/p&gt;&lt;/li&gt;
-&lt;/ul&gt;
-
-&lt;h3 id="jails"&gt;Microsoft Jails&lt;/h3&gt;
-&lt;ul&gt;
-  &lt;li&gt;&lt;p&gt;&lt;a 
href="http://www.itworld.com/operating-systems/301057/microsoft-metro-app-store-lockdown"&gt;</strong></del></span>
 <span class="inserted"><ins><em>older versions of Windows: &lt;a
-    
href="https://www.theregister.co.uk/2003/02/28/windows_update_keeps_tabs/"&gt;</em></ins></span>
-    Windows <span class="removed"><del><strong>8</strong></del></span> <span 
class="inserted"><ins><em>Update snoops</em></ins></span> on <span 
class="removed"><del><strong>&ldquo;mobile devices&rdquo; is a jail&lt;/a&gt;: 
it censors</strong></del></span> the
-  <span class="removed"><del><strong>user's choice of application 
programs.&lt;/p&gt;&lt;/li&gt;</strong></del></span> <span 
class="inserted"><ins><em>user&lt;/a&gt;. &lt;a
+    &lt;p&gt;Spyware in older versions of Windows: &lt;a
+    
href="https://www.theregister.co.uk/2003/02/28/windows_update_keeps_tabs/"&gt;
+    Windows Update snoops on</em></ins></span> the <span 
class="removed"><del><strong>same malware would later be 
introduced</strong></del></span> <span 
class="inserted"><ins><em>user&lt;/a&gt;. &lt;a
     
href="https://www.infoworld.com/article/2611451/microsoft-windows/a-look-at-the-black-underbelly-of-windows-8-1--blue-.html"&gt;
     Windows 8.1 snoops on local searches&lt;/a&gt;. And there's a &lt;a
     href="http://www.marketoracle.co.uk/Article40836.html"&gt; secret NSA
-    key in Windows&lt;/a&gt;, whose functions we don't know.&lt;/p&gt;
+    key</em></ins></span> in <span 
class="removed"><del><strong>MacOS.)&lt;/p&gt;&lt;/li&gt;</strong></del></span> 
<span class="inserted"><ins><em>Windows&lt;/a&gt;, whose functions we don't 
know.&lt;/p&gt;
+  &lt;/li&gt;</em></ins></span>
+&lt;/ul&gt;
+
+
+&lt;h3 id="jails"&gt;Microsoft Jails&lt;/h3&gt;
+<span class="removed"><del><strong>&lt;ul&gt;
+  &lt;li&gt;&lt;p&gt;&lt;a 
href="http://www.itworld.com/operating-systems/301057/microsoft-metro-app-store-lockdown"&gt;</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;ul class="blurbs"&gt;
+&lt;!-- INSERT microsoft-jail --&gt;
+  &lt;li id="M201706130"&gt;
+    &lt;p&gt;Windows 10 S was a jail: &lt;a
+    
href="https://www.theguardian.com/technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison"&gt;
+    only programs from the Windows Store could be
+    installed and executed&lt;/a&gt;. It was however possible to &lt;a
+    
href="https://www.theverge.com/2017/6/13/15789998/microsoft-windows-10-s-upgrade-windows-10-pro-guide"&gt;
+    upgrade to Windows 10 Pro&lt;/a&gt;. The successor of Windows
+    10 S is a special configuration of Windows 10 called &lt;a
+    
href="https://support.microsoft.com/en-gb/help/4020089/windows-10-in-s-mode-faq"&gt;
+    S mode&lt;/a&gt;. The major difference with Windows 10 S is that there is
+    an easy way to switch out of S mode.&lt;/p&gt;
+  &lt;/li&gt;
+
+  &lt;li id="M201210080"&gt;
+    &lt;p&gt;&lt;a
+    
href="http://www.itworld.com/article/2832657/operating-systems/microsoft-metro-app-store-lock-down.html"&gt;</em></ins></span>
+    Windows 8 on &ldquo;mobile devices&rdquo; <span 
class="removed"><del><strong>is</strong></del></span> <span 
class="inserted"><ins><em>(now defunct) was</em></ins></span> a <span 
class="removed"><del><strong>jail&lt;/a&gt;: it censors the
+  user's choice of application 
programs.&lt;/p&gt;&lt;/li&gt;</strong></del></span>
+    <span class="inserted"><ins><em>jail&lt;/a&gt;.&lt;/p&gt;
   &lt;/li&gt;</em></ins></span>
 &lt;/ul&gt;
 
@@ -739,7 +749,7 @@
 &lt;li&gt;</strong></del></span>
 
 <span class="inserted"><ins><em>&lt;ul class="blurbs"&gt;
-&lt;!-- INSERT tyrants --&gt;
+&lt;!-- INSERT microsoft-tyrant --&gt;
   &lt;li id="M201607150"&gt;</em></ins></span>
     &lt;p&gt;Microsoft accidentally left a way for users
     to install GNU/Linux on Windows RT tablets, but now it has &lt;a
@@ -823,7 +833,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2018/10/05 17:29:56 $
+$Date: 2018/10/07 19:58:31 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: malware-microsoft.ja.po
===================================================================
RCS file: /web/www/www/proprietary/po/malware-microsoft.ja.po,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- malware-microsoft.ja.po     5 Oct 2018 17:29:56 -0000       1.102
+++ malware-microsoft.ja.po     7 Oct 2018 19:58:31 -0000       1.103
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: malware-microsoft.html\n"
-"POT-Creation-Date: 2018-10-05 17:25+0000\n"
+"POT-Creation-Date: 2018-10-07 19:56+0000\n"
 "PO-Revision-Date: 2016-12-20 14:57+0900\n"
 "Last-Translator: NIIBE Yutaka <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -66,7 +66,7 @@
 "もないことを知る開発者
は、それを少しばかり押し付けようかと誘惑されるからで"
 "す。"
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "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"
@@ -218,6 +218,16 @@
 "府は、それは信用できない、と決定しました</a>。"
 
 #. type: Content of: <ul><li><p>
+msgid ""
+"Here is a suspicion that we can't prove, but is worth thinking about: <a "
+"href=\"https://web.archive.org/web/20150206003913/http://www.afr.com/p/";
+"technology/intel_chips_could_be_nsa_key_to_ymrhS1HS1633gCWKt5tFtI\"> "
+"Writable microcode for Intel and AMD microprocessors</a> may be a vehicle "
+"for the NSA to invade computers, with the help of Microsoft, say respected "
+"security experts."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
 #, fuzzy
 #| msgid ""
 #| "<a href=\"http://www.computerworld.com/article/2500036/desktop-apps/";
@@ -459,38 +469,6 @@
 "しょう。"
 
 #. type: Content of: <h3>
-msgid "Microsoft Jails"
-msgstr "マイクロソフトの牢獄"
-
-#. type: Content of: <ul><li><p>
-msgid ""
-"Windows 10 S was a jail: <a href=\"https://www.theguardian.com/";
-"technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\"> only "
-"programs from the Windows Store could be installed and executed</a>. It was "
-"however possible to <a href=\"https://www.theverge.com/2017/6/13/15789998/";
-"microsoft-windows-10-s-upgrade-windows-10-pro-guide\"> upgrade to Windows 10 "
-"Pro</a>. The successor of Windows 10 S is a special configuration of Windows "
-"10 called <a href=\"https://support.microsoft.com/en-gb/help/4020089/";
-"windows-10-in-s-mode-faq\"> S mode</a>. The major difference with Windows 10 "
-"S is that there is an easy way to switch out of S mode."
-msgstr ""
-
-#. type: Content of: <ul><li><p>
-#, fuzzy
-#| msgid ""
-#| "<a href=\"http://www.itworld.com/operating-systems/301057/microsoft-metro-";
-#| "app-store-lockdown\"> Windows 8 on &ldquo;mobile devices&rdquo; is a "
-#| "jail</a>: it censors the user's choice of application programs."
-msgid ""
-"<a href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-";
-"metro-app-store-lock-down.html\"> Windows 8 on &ldquo;mobile devices&rdquo; "
-"(now defunct) was a jail</a>."
-msgstr ""
-"<a href=\"http://www.itworld.com/operating-systems/301057/microsoft-metro-";
-"app-store-lockdown\">「モバイルデバイス」のウィンドウズ8は牢獄です</a>:
 ユー"
-"ザのアプリケーションプログラムの選択を検閲します。"
-
-#. type: Content of: <h3>
 msgid "Microsoft Sabotage"
 msgstr "マイクロソフトの妨害"
 
@@ -975,6 +953,38 @@
 "ません。"
 
 #. type: Content of: <h3>
+msgid "Microsoft Jails"
+msgstr "マイクロソフトの牢獄"
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"Windows 10 S was a jail: <a href=\"https://www.theguardian.com/";
+"technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\"> only "
+"programs from the Windows Store could be installed and executed</a>. It was "
+"however possible to <a href=\"https://www.theverge.com/2017/6/13/15789998/";
+"microsoft-windows-10-s-upgrade-windows-10-pro-guide\"> upgrade to Windows 10 "
+"Pro</a>. The successor of Windows 10 S is a special configuration of Windows "
+"10 called <a href=\"https://support.microsoft.com/en-gb/help/4020089/";
+"windows-10-in-s-mode-faq\"> S mode</a>. The major difference with Windows 10 "
+"S is that there is an easy way to switch out of S mode."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
+#, fuzzy
+#| msgid ""
+#| "<a href=\"http://www.itworld.com/operating-systems/301057/microsoft-metro-";
+#| "app-store-lockdown\"> Windows 8 on &ldquo;mobile devices&rdquo; is a "
+#| "jail</a>: it censors the user's choice of application programs."
+msgid ""
+"<a href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-";
+"metro-app-store-lock-down.html\"> Windows 8 on &ldquo;mobile devices&rdquo; "
+"(now defunct) was a jail</a>."
+msgstr ""
+"<a href=\"http://www.itworld.com/operating-systems/301057/microsoft-metro-";
+"app-store-lockdown\">「モバイルデバイス」のウィンドウズ8は牢獄です</a>:
 ユー"
+"ザのアプリケーションプログラムの選択を検閲します。"
+
+#. type: Content of: <h3>
 msgid "Microsoft Tyrants"
 msgstr "マイクロソフトの暴君"
 

Index: malware-microsoft.pot
===================================================================
RCS file: /web/www/www/proprietary/po/malware-microsoft.pot,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- malware-microsoft.pot       5 Oct 2018 17:29:56 -0000       1.67
+++ malware-microsoft.pot       7 Oct 2018 19:58:31 -0000       1.68
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: malware-microsoft.html\n"
-"POT-Creation-Date: 2018-10-05 17:25+0000\n"
+"POT-Creation-Date: 2018-10-07 19:56+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -50,7 +50,7 @@
 "functionalities tempts the developer to impose some."
 msgstr ""
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "If you know of an example that ought to be in this page but isn't here, "
 "please write to <a "
@@ -152,6 +152,15 @@
 
 #. type: Content of: <ul><li><p>
 msgid ""
+"Here is a suspicion that we can't prove, but is worth thinking about: <a "
+"href=\"https://web.archive.org/web/20150206003913/http://www.afr.com/p/technology/intel_chips_could_be_nsa_key_to_ymrhS1HS1633gCWKt5tFtI\";>
 "
+"Writable microcode for Intel and AMD microprocessors</a> may be a vehicle "
+"for the NSA to invade computers, with the help of Microsoft, say respected "
+"security experts."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
+msgid ""
 "Windows 8 also has a back door for <a "
 
"href=\"http://www.computerworld.com/article/2500036/desktop-apps/microsoft--we-can-remotely-delete-windows-8-apps.html\";>
 "
 "remotely deleting apps</a>."
@@ -314,31 +323,6 @@
 msgstr ""
 
 #. type: Content of: <h3>
-msgid "Microsoft Jails"
-msgstr ""
-
-#. type: Content of: <ul><li><p>
-msgid ""
-"Windows 10 S was a jail: <a "
-"href=\"https://www.theguardian.com/technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\";>
 "
-"only programs from the Windows Store could be installed and executed</a>. It "
-"was however possible to <a "
-"href=\"https://www.theverge.com/2017/6/13/15789998/microsoft-windows-10-s-upgrade-windows-10-pro-guide\";>
 "
-"upgrade to Windows 10 Pro</a>. The successor of Windows 10 S is a special "
-"configuration of Windows 10 called <a "
-"href=\"https://support.microsoft.com/en-gb/help/4020089/windows-10-in-s-mode-faq\";>
 "
-"S mode</a>. The major difference with Windows 10 S is that there is an easy "
-"way to switch out of S mode."
-msgstr ""
-
-#. type: Content of: <ul><li><p>
-msgid ""
-"<a "
-"href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-metro-app-store-lock-down.html\";>
 "
-"Windows 8 on &ldquo;mobile devices&rdquo; (now defunct) was a jail</a>."
-msgstr ""
-
-#. type: Content of: <h3>
 msgid "Microsoft Sabotage"
 msgstr ""
 
@@ -644,6 +628,31 @@
 msgstr ""
 
 #. type: Content of: <h3>
+msgid "Microsoft Jails"
+msgstr ""
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"Windows 10 S was a jail: <a "
+"href=\"https://www.theguardian.com/technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\";>
 "
+"only programs from the Windows Store could be installed and executed</a>. It "
+"was however possible to <a "
+"href=\"https://www.theverge.com/2017/6/13/15789998/microsoft-windows-10-s-upgrade-windows-10-pro-guide\";>
 "
+"upgrade to Windows 10 Pro</a>. The successor of Windows 10 S is a special "
+"configuration of Windows 10 called <a "
+"href=\"https://support.microsoft.com/en-gb/help/4020089/windows-10-in-s-mode-faq\";>
 "
+"S mode</a>. The major difference with Windows 10 S is that there is an easy "
+"way to switch out of S mode."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"<a "
+"href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-metro-app-store-lock-down.html\";>
 "
+"Windows 8 on &ldquo;mobile devices&rdquo; (now defunct) was a jail</a>."
+msgstr ""
+
+#. type: Content of: <h3>
 msgid "Microsoft Tyrants"
 msgstr ""
 

Index: malware-microsoft.ru.po
===================================================================
RCS file: /web/www/www/proprietary/po/malware-microsoft.ru.po,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -b -r1.174 -r1.175
--- malware-microsoft.ru.po     5 Oct 2018 17:59:48 -0000       1.174
+++ malware-microsoft.ru.po     7 Oct 2018 19:58:31 -0000       1.175
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: malware-microsoft.html\n"
-"POT-Creation-Date: 2018-10-05 17:25+0000\n"
+"POT-Creation-Date: 2018-10-07 19:56+0000\n"
 "PO-Revision-Date: 2018-10-05 08:54+0000\n"
 "Last-Translator: Ineiev <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2018-10-07 19:56+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -67,7 +68,7 @@
 "будут бессильны исправить любые 
вредоносные функции, соблазняет 
разработчика "
 "вносить такие функции."
 
-#. type: Content of: <div><p>
+#. type: Content of: <div><div><p>
 msgid ""
 "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"
@@ -200,6 +201,16 @@
 
 #. type: Content of: <ul><li><p>
 msgid ""
+"Here is a suspicion that we can't prove, but is worth thinking about: <a "
+"href=\"https://web.archive.org/web/20150206003913/http://www.afr.com/p/";
+"technology/intel_chips_could_be_nsa_key_to_ymrhS1HS1633gCWKt5tFtI\"> "
+"Writable microcode for Intel and AMD microprocessors</a> may be a vehicle "
+"for the NSA to invade computers, with the help of Microsoft, say respected "
+"security experts."
+msgstr ""
+
+#. type: Content of: <ul><li><p>
+msgid ""
 "Windows 8 also has a back door for <a href=\"http://www.computerworld.com/";
 "article/2500036/desktop-apps/microsoft--we-can-remotely-delete-windows-8-"
 "apps.html\"> remotely deleting apps</a>."
@@ -444,42 +455,6 @@
 "поддержки старой версии на ваших будущих 
платформах."
 
 #. type: Content of: <h3>
-msgid "Microsoft Jails"
-msgstr "Тюрьмы"
-
-#. type: Content of: <ul><li><p>
-msgid ""
-"Windows 10 S was a jail: <a href=\"https://www.theguardian.com/";
-"technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\"> only "
-"programs from the Windows Store could be installed and executed</a>. It was "
-"however possible to <a href=\"https://www.theverge.com/2017/6/13/15789998/";
-"microsoft-windows-10-s-upgrade-windows-10-pro-guide\"> upgrade to Windows 10 "
-"Pro</a>. The successor of Windows 10 S is a special configuration of Windows "
-"10 called <a href=\"https://support.microsoft.com/en-gb/help/4020089/";
-"windows-10-in-s-mode-faq\"> S mode</a>. The major difference with Windows 10 "
-"S is that there is an easy way to switch out of S mode."
-msgstr ""
-"Windows 10 S была тюрьмой: <a \t 
href=\"https://www.theguardian.com/";
-"technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\"> 
можно "
-"было установить и выполнять только 
программы из Windows Store</a>. Однако "
-"была возможность <a 
href=\"https://www.theverge.com/2017/6/13/15789998/";
-"microsoft-windows-10-s-upgrade-windows-10-pro-guide\"> обновиться 
до Windows "
-"10 Pro</a>. Последователем Windows 10 S стала особая 
конфигурация Windows "
-"10, называемая <a 
href=\"https://support.microsoft.com/en-gb/help/4020089/";
-"windows-10-in-s-mode-faq\">режимом S</a>. Важное отличие 
от Windows 10 S "
-"состоит в том, что есть простой способ 
выйти из режима S."
-
-#. type: Content of: <ul><li><p>
-msgid ""
-"<a href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-";
-"metro-app-store-lock-down.html\"> Windows 8 on &ldquo;mobile devices&rdquo; "
-"(now defunct) was a jail</a>."
-msgstr ""
-"<a href=\"http://www.itworld.com/operating-systems/301057/microsoft-metro-";
-"app-store-lockdown\"> Windows 8 на &ldquo;мобильных 
устройствах&rdquo; (ныне "
-"покойная) была тюрьмой</a>."
-
-#. type: Content of: <h3>
 msgid "Microsoft Sabotage"
 msgstr "Саботаж"
 
@@ -940,6 +915,42 @@
 "секретный ключ АНБ</a>, функции которого 
нам неизвестны."
 
 #. type: Content of: <h3>
+msgid "Microsoft Jails"
+msgstr "Тюрьмы"
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"Windows 10 S was a jail: <a href=\"https://www.theguardian.com/";
+"technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\"> only "
+"programs from the Windows Store could be installed and executed</a>. It was "
+"however possible to <a href=\"https://www.theverge.com/2017/6/13/15789998/";
+"microsoft-windows-10-s-upgrade-windows-10-pro-guide\"> upgrade to Windows 10 "
+"Pro</a>. The successor of Windows 10 S is a special configuration of Windows "
+"10 called <a href=\"https://support.microsoft.com/en-gb/help/4020089/";
+"windows-10-in-s-mode-faq\"> S mode</a>. The major difference with Windows 10 "
+"S is that there is an easy way to switch out of S mode."
+msgstr ""
+"Windows 10 S была тюрьмой: <a \t 
href=\"https://www.theguardian.com/";
+"technology/2017/may/03/windows-10-s-microsoft-faster-pc-comparison\"> 
можно "
+"было установить и выполнять только 
программы из Windows Store</a>. Однако "
+"была возможность <a 
href=\"https://www.theverge.com/2017/6/13/15789998/";
+"microsoft-windows-10-s-upgrade-windows-10-pro-guide\"> обновиться 
до Windows "
+"10 Pro</a>. Последователем Windows 10 S стала особая 
конфигурация Windows "
+"10, называемая <a 
href=\"https://support.microsoft.com/en-gb/help/4020089/";
+"windows-10-in-s-mode-faq\">режимом S</a>. Важное отличие 
от Windows 10 S "
+"состоит в том, что есть простой способ 
выйти из режима S."
+
+#. type: Content of: <ul><li><p>
+msgid ""
+"<a href=\"http://www.itworld.com/article/2832657/operating-systems/microsoft-";
+"metro-app-store-lock-down.html\"> Windows 8 on &ldquo;mobile devices&rdquo; "
+"(now defunct) was a jail</a>."
+msgstr ""
+"<a href=\"http://www.itworld.com/operating-systems/301057/microsoft-metro-";
+"app-store-lockdown\"> Windows 8 на &ldquo;мобильных 
устройствах&rdquo; (ныне "
+"покойная) была тюрьмой</a>."
+
+#. type: Content of: <h3>
 msgid "Microsoft Tyrants"
 msgstr "Тираны"
reply via email to
[Prev in Thread] Current Thread [Next in Thread]