X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=MicrosoftTactics;h=76510a66da85dbbaea34481deda10c8bb7e80f94;hb=748268b2cafb48bf026d4f290e2cd5c28acb8eda;hp=d1ff654242faac868604bf12c0aa59e74593c518;hpb=be5847bdf2e8d291e506230c0c88553d08aa66e5;p=wiki.git

diff --git a/MicrosoftTactics b/MicrosoftTactics
index d1ff654..76510a6 100644
--- a/MicrosoftTactics
+++ b/MicrosoftTactics
@@ -1,7 +1,7 @@
 == Microsoft's VS Free Software ==
 
 Why does Microsoft deserve special casing among all companies producing proprietary software?  Because
-**Microsoft is the only company that actively and repeatedly tried for years to kill FreeSoftware and Linux.**
+**Microsoft is the only company that actively and repeatedly tried for years to kill FreeSoftware and GNU/Linux.**
 
 This is a collection of a variety of strategies attempted by Microsoft
 against an extremely resilient competitor that couldn't be simply brought
@@ -14,7 +14,7 @@ steve_ballmer_bill_gates_i_wish_i_knew_how_to_quit_you.jpg
 
  * [[http://arstechnica.com/open-source/news/2009/09/linux-foundation-to-microsoft-stop-secretly-attacking-linux.ars | Selling Linux related patents to trolls ]] (Sep 2009)
 
- * [[http://www.ditii.com/2009/09/08/microsoft-linux-vs-windows-7-slideshow-for-retailers-targets-linux/ | Linux vs Windows 7 slides for retailers]] (2009)
+ * [[http://www.ditii.com/2009/09/08/microsoft-linux-vs-windows-7-slideshow-for-retailers-targets-linux/ | Linux vs Windows 7 slides for retailers]] (Aug 2009)
 
 
  * [[http://www.theregister.co.uk/2001/06/02/ballmer_linux_is_a_cancer/ | Linux is a Cancer]] -- Steve Ballmer, CEO (2001)
@@ -71,8 +71,9 @@ steve_ballmer_bill_gates_i_wish_i_knew_how_to_quit_you.jpg
 
  * Bribe ISO into accepting OOXML (2008)
 
- * Passport
+ * The [[http://en.wikipedia.org/wiki/Windows_Live_ID#Problems | Passport]] authentication scheme (aka Microsoft Wallet, aka Windows Live ID (2007).
 
+ * [[http://www.fsfe.org/projects/os/bsa-letter-analysis.html.en | BSA Letter]], pressuring the European Commission to stop supporting open standards.
 
 === Targeting specific FLOSS projects ===
 
@@ -84,6 +85,7 @@ steve_ballmer_bill_gates_i_wish_i_knew_how_to_quit_you.jpg
 
  * The [[http://www.microsoft.com/uk/servers/winclientshearts/ | Windows loves PHP]] campaign to promote the WAMP platform (2008)
 
+ * [[http://arstechnica.com/microsoft/news/2010/10/microsoft-posts-video-of-customers-criticizing-openoffice.ars Video against OpenOffice]] and OpenSource in general (2010)
 
 === Targeting OpenSource licenses and development model ===
 
@@ -95,6 +97,10 @@ steve_ballmer_bill_gates_i_wish_i_knew_how_to_quit_you.jpg
 
  * [[http://www.codeplex.org/|CodePlex foundation]] -- Motivation behind this initiative is still unclear (as of Sep 2009)
 
+=== Targeting Microsoft customers ===
+
+ * [[http://arstechnica.com/microsoft/news/2010/06/microsoft-slips-ie-firefox-add-on-into-toolbar-update.ars | Microsoft hides mystery Firefox extension in toolbar update]]
+
 == Help wanted! ==
 
 Please help expand and verify this list!