X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=MicrosoftTactics;h=02a267dc9318b863f9f872fe022e3328d71ebba6;hp=bb92868183f6fc20aadadb06455c8e1ef816ec7a;hb=f8f206c38f9fe0fae93fcad9db44a617706fe105;hpb=43b8fbf4065e7e0fb3370bf0f6be861045c1092b

diff --git a/MicrosoftTactics b/MicrosoftTactics
index bb92868..02a267d 100644
--- a/MicrosoftTactics
+++ b/MicrosoftTactics
@@ -66,14 +66,14 @@ steve_ballmer_bill_gates_i_wish_i_knew_how_to_quit_you.jpg
 
 === Targeting open standards ===
 
-
  * Creating OOXML to disrupt the Open Document Format.
 
  * Bribe ISO into accepting OOXML (2008)
 
  * The [[http://en.wikipedia.org/wiki/Windows_Live_ID#Problems | Passport]] authentication scheme (aka Microsoft Wallet, aka Windows Live ID (2007).
 
- * Tactic for [[http://www.groklaw.net/articlebasic.php?story=20071023002351958|taking over standard panels]] by controlling the moderator.
+ * Tactic for [[http://www.groklaw.net/articlebasic.php?story=20071023002351958|taking over standard panels]] by controlling the moderator (1997-2008).
+
 
 === Targeting specific FLOSS projects ===
 
@@ -85,9 +85,16 @@ 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)
+ * [[http://arstechnica.com/microsoft/news/2010/10/microsoft-posts-video-of-customers-criticizing-openoffice.ars|Video against OpenOffice]] and OpenSource in general (2010)
+
+ * [[http://www.groklaw.net/article.php?story=20110322014831856|Undercover Microsoft lawyer]] attacks Android for alleged GPL violations (2011)
+
+ * [[http://googleblog.blogspot.com/2011/08/when-patents-attack-android.html|Patent attack on Android]] from Microsoft, Apple and Oracle (2011).
 
-=== Targeting OpenSource licenses and development model ===
+
+=== Targeting Free Software licenses and development model ===
+
+ * [[http://jan.wildeboer.net/2011/02/microsoft-absolutely-no-free-software-for-windows-phone-and-xbox-apps/|Exclude GPLv3 and other copyleft licenses from Windows Phone and XBox appstore]] (2011)
 
  * Claiming the GPLv3 is invalid and unenforceable (in the context of distributing the Novell "vouchers" to customers)
 
@@ -97,10 +104,12 @@ 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 ===
+
+=== Targeting Microsoft's own 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!