Edit page MicrosoftTactics

diff --git a/MicrosoftTactics b/MicrosoftTactics
index c6ba57abfedd1380a62a9a900faf0c32100b7e53..fae91665d9bac4e74e71d7678e16ed3fb7129615 100644 (file)
--- a/MicrosoftTactics
+++ b/MicrosoftTactics
@@ -1,8 +1,6 @@
 == Microsoft's dirty tactics against FreeSoftware ==
 
-Please help expand and verify the following list.
-Each claim should come with links to supporting material.
-
+{{steve_ballmer_bill_gates_i_wish_i_knew_how_to_quit_you.jpg}}
 
 === Targeting GNU/Linux ===
 
@@ -25,46 +23,59 @@ Each claim should come with links to supporting material.
 
 === Targeting Linux distributors ===
 
- * Paying Novell with the "vouchers"
+ * Paying Novell with the "vouchers" for unclear "interoperability" agreements
 
  * Paying Novell again
 
  * Attempting to [[http://olpcnews.com/sales_talk/microsoft/how_microsoft_got_xp_on_the_xo.html | take over OLPC]] (2005)
 
+=== Targeting hardware vendors ===
+
  * [[http://money.cnn.com/2008/05/15/technology/microsoft_olpc.fortune/index.htm | Undisclosed deal between Bill Gates and Nicholas Negroponte]], disrupting OLPC (2008)
 
+ * Dumping Linux in Australia on the Asus EEE PC (2008)
+
+
 === Targeting Apple ===
 
  * Fake "Mac switchers" campaign with stock photos of models
 
- * The "I'm a PC" campaign
+ * The "I'm a PC" campaign (2008)
 
 
 === Targeting open standards ===
 
+
  * Creating OOXML to disrupt the Open Document Format.
 
- * Bribe ISO into accepting OOXML
+ * Bribe ISO into accepting OOXML (2008)
 
  * Passport
 
 
 === Targeting specific FLOSS projects ===
 
- * Bribe Blender
+ * Bribe Blender (2008)
 
- * Bribe PHP
+ * Bribe PHP (2008)
 
- * $100K bribe to Apache Software Foundation
+ * $100K bribe to Apache Software Foundation (2008)
 
- * The [[http://www.microsoft.com/uk/servers/winclientshearts/ | Windows loves PHP]] campaign (WAMP)
+ * The [[http://www.microsoft.com/uk/servers/winclientshearts/ | Windows loves PHP]] campaign to promote the WAMP platform (2008)
 
 
 === Targeting OpenSource licenses ===
 
  * Claiming the GPL is invalid and unenforceable
 
+ * Halloween documents
 
 === Misc ===
 
- * The (RED) campaign with the U2
+ * The (RED) campaign with the U2 (2008)
+
+
+== Help wanted! ==
+
+Please help expand and verify this list!
+Each claim should come with links to supporting material.