www/proprietary malware-microsoft.html propriet...

[Pavel Kharitonov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Pavel Kharitonov <ineiev>       16/07/11 08:48:16

Modified files:
        proprietary    : malware-microsoft.html 
                         proprietary-interference.html proprietary.html 
Removed files:
        proprietary    : proprietary-harassment.html 

Log message:
        Merge harassment to interference RT #1124865.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/malware-microsoft.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-interference.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-harassment.html?cvsroot=www&r1=1.1&r2=0

Patches:
Index: malware-microsoft.html
===================================================================
RCS file: /web/www/www/proprietary/malware-microsoft.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- malware-microsoft.html      8 Jul 2016 23:18:17 -0000       1.32
+++ malware-microsoft.html      11 Jul 2016 08:48:16 -0000      1.33
@@ -46,7 +46,6 @@
 <li><a href="#sabotage">Sabotage</a></li>
 <li><a href="#interference">Interference</a></li>
 <li><a href="#surveillance">Surveillance</a></li>
-<li><a href="#harassment">Harassment</a></li>
 <li><a href="#drm">Digital restrictions
     management</a> or &ldquo;DRM&rdquo; means functionalities designed
     to restrict what users can do with the data in their computers.</li>
@@ -164,6 +163,10 @@
 
 <ul>
 
+<li><p>Microsoft has
+started <a 
href="https://www.theguardian.com/technology/2016/jul/04/microsoft-windows-10-full-screen-upgrade-notification-pop-up-reminder";>nagging
+users obnoxiously and repeatedly to install Windows 10</a>.</p></li>
+
   <li><p>Microsoft
       <a 
href="http://news.softpedia.com/news/windows-10-upgrade-reportedly-starting-automatically-on-windows-7-pcs-501651.shtml";>is
         tricking
@@ -248,14 +251,6 @@
   in MacOS.)</p></li>
 </ul>
 
-<h3 id="harassment">Microsoft Harassment</h3>
-
-<ul>
-  <li><p>Microsoft has
-  started <a 
href="https://www.theguardian.com/technology/2016/jul/04/microsoft-windows-10-full-screen-upgrade-notification-pop-up-reminder";>nagging
-  users obnoxiously and repeatedly to install Windows 10</a>.</p></li>
-</ul>
-
 <h3 id="jails">Microsoft Jails</h3>
 <ul>
   <li><p><a 
href="http://www.itworld.com/operating-systems/301057/microsoft-metro-app-store-lockdown";>
@@ -331,7 +326,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/07/08 23:18:17 $
+$Date: 2016/07/11 08:48:16 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary-interference.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary-interference.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- proprietary-interference.html       10 Jun 2016 18:26:45 -0000      1.18
+++ proprietary-interference.html       11 Jul 2016 08:48:16 -0000      1.19
@@ -14,6 +14,13 @@
 
 <ul>
 
+<li>
+<p>Microsoft has
+started <a
+href="https://www.theguardian.com/technology/2016/jul/04/microsoft-windows-10-full-screen-upgrade-notification-pop-up-reminder";>
+nagging users obnoxiously and repeatedly to install Windows 10</a>.</p>
+</li>
+
 <li><p>Microsoft
     <a 
href="http://news.softpedia.com/news/windows-10-upgrade-reportedly-starting-automatically-on-windows-7-pcs-501651.shtml";>is
       tricking users</a> <a
@@ -128,7 +135,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/06/10 18:26:45 $
+$Date: 2016/07/11 08:48:16 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary.html
===================================================================
RCS file: /web/www/www/proprietary/proprietary.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- proprietary.html    8 Jul 2016 23:55:34 -0000       1.7
+++ proprietary.html    11 Jul 2016 08:48:16 -0000      1.8
@@ -1,5 +1,5 @@
 <!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
+<!-- Parent-Version: 1.79 -->
 <title>Proprietary Software
 - GNU Project - Free Software Foundation</title>
  <!--#include virtual="/proprietary/po/proprietary.translist" -->
@@ -59,7 +59,6 @@
 <li><a href="/proprietary/proprietary-sabotage.html">Sabotage</a></li>
 <li><a href="/proprietary/proprietary-interference.html">Interference</a></li>
 <li><a href="/proprietary/proprietary-surveillance.html">Surveillance</a></li>
-<li><a href="/proprietary/proprietary-harassment.html">Harassment</a></li>
 <li><a href="/proprietary/proprietary-drm.html">Digital restrictions
     management</a> or &ldquo;DRM&rdquo; means functionalities designed
     to restrict what users can do with the data in their computers.</li>
@@ -136,7 +135,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/07/08 23:55:34 $
+$Date: 2016/07/11 08:48:16 $
 <!-- timestamp end -->
 </p>
 </div>

Index: proprietary-harassment.html
===================================================================
RCS file: proprietary-harassment.html
diff -N proprietary-harassment.html
--- proprietary-harassment.html 8 Jul 2016 23:18:17 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,65 +0,0 @@
-<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.77 -->
-<title>Proprietary Harassment - GNU Project - Free Software Foundation</title>
-<!--#include virtual="/server/gnun/initial-translations-list.html" -->
-<!--#include virtual="/server/banner.html" -->
-<h2>Proprietary Harassment</h2>
-
-<a href="/proprietary/proprietary.html">Other examples of proprietary 
malware</a>
-
-<!-- WEBMASTERS: make sure to place new items on top under each subsection -->
-<ul>
-  <li>
-    <p>Microsoft has
-    started <a 
href="https://www.theguardian.com/technology/2016/jul/04/microsoft-windows-10-full-screen-upgrade-notification-pop-up-reminder";>nagging
-    users obnoxiously and repeatedly to install Windows 10</a>.</p>
-  </li>
-</ul>
-
-</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/footer.html" -->
-<div id="footer">
-<div class="unprintable">
-
-<p>Please send general FSF &amp; GNU inquiries to
-<a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.
-There are also <a href="/contact/">other ways to contact</a>
-the FSF.  Broken links and other corrections or suggestions can be sent
-to <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>.</p>
-
-<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
-        replace it with the translation of these two:
-
-        We work hard and do our best to provide accurate, good quality
-        translations.  However, we are not exempt from imperfection.
-        Please send your comments and general suggestions in this regard
-        to <a href="mailto:address@hidden";>
-        &lt;address@hidden&gt;</a>.</p>
-
-        <p>For information on coordinating and submitting translations of
-        our web pages, see <a
-        href="/server/standards/README.translations.html">Translations
-        README</a>. -->
-Please see the <a
-href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
-of this article.</p>
-</div>
-
-<p>Copyright &copy; 2014-2016 Free Software Foundation, Inc.</p>
-
-<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
-
-<!--#include virtual="/server/bottom-notes.html" -->
-
-<p class="unprintable">Updated:
-<!-- timestamp start -->
-$Date: 2016/07/08 23:18:17 $
-<!-- timestamp end -->
-</p>
-</div>
-</div>
-</body>
-</html>