summaryrefslogtreecommitdiff
path: root/blends/talk
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2011-10-25 13:01:42 +0530
committerJonas Smedegaard <dr@jones.dk>2011-10-25 13:01:42 +0530
commit8da66a1d9e9f18e198e8e53a0b17ad0aa05b7f34 (patch)
treec404048a292c935eae747bbb0ccd20429c5fb34b /blends/talk
parenta29b3c4d3a25ccaa8f9800e4e27226f437868f59 (diff)
Improve FLOSS slides.
Diffstat (limited to 'blends/talk')
-rw-r--r--blends/talk/swecha.mkd38
1 files changed, 23 insertions, 15 deletions
diff --git a/blends/talk/swecha.mkd b/blends/talk/swecha.mkd
index 614f62e..f6f6176 100644
--- a/blends/talk/swecha.mkd
+++ b/blends/talk/swecha.mkd
@@ -10,29 +10,37 @@
* Customizing Debian
* Power & World Peace
-# Free Software
+Free is **costly** and **challenging**
- * Free from **some** limits
- * Choice → Control → Power
- * (Lack of choice → Simplicity → Usability)
+# FLOSS
-Free is **costly** and **challenging**
+**FLOSS** == **F**ree/**L**ibre **O**pen **S**ource **S**oftware
+
+# FLOSS - Free Software
+
+Free/Libre: Freedom Fighters wanting to **share**
+
+ * Liberate commons from bounds of competition
+ * Bind inventions from being used for competition
+
+# FLOSS - Open Source
+
+Open Source: Business folks wanting to **trade**
+
+ * Liberate competition
+ * Bind commons
# FLOSS
- * **FLOSS** == **F**ree/**L**ibre **O**pen **S**ource **S**oftware
- * Free/Libre: Freedom Fighters wanting to **share**
- * Liberate commons from bounds of competition
- * Bind inventions from being used for competition
- * Open Source: Business folks wanting to **trade**
- * Liberate competition
- * Bind commons
+**FLOSS** == **F**ree/**L**ibre **O**pen **S**ource **S**oftware
-Like "peace": we all want it, but at different cost
+Floss: Friendly cooperation between liberators and liberals
-# FLOSS is World Peace
+# FLOSS - more twists of words
-Floss: Peaceful cooperation between liberators and liberals
+ * Free from **some** limits
+ * Choice → Control → Power
+ * (Lack of choice → Simplicity → Usability)
# FLOSS parts