diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2011-10-25 13:01:46 +0530 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2011-10-25 13:01:46 +0530 |
| commit | 9467819190fdd3d28ec534fcfe1895630f4c4c4a (patch) | |
| tree | 19ec8f7a9fc1565dc3a4d8f3f3dbe1e266558c94 /blends/talk | |
| parent | 8da66a1d9e9f18e198e8e53a0b17ad0aa05b7f34 (diff) | |
Regenerate talk.
Diffstat (limited to 'blends/talk')
| -rw-r--r-- | blends/talk/swecha/index.html | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/blends/talk/swecha/index.html b/blends/talk/swecha/index.html index 755e6af..65b5546 100644 --- a/blends/talk/swecha/index.html +++ b/blends/talk/swecha/index.html @@ -29,32 +29,40 @@ Jonas Smedegaard <li>Customizing Debian</li> <li>Power & World Peace</li> </ul> -</div> -<div class="slide"> -<h1 id="free-software">Free Software</h1> -<ul> -<li>Free from <strong>some</strong> limits</li> -<li>Choice → Control → Power</li> -<li>(Lack of choice → Simplicity → Usability)</li> -</ul> <p>Free is <strong>costly</strong> and <strong>challenging</strong></p> </div> <div class="slide"> <h1 id="floss">FLOSS</h1> +<p><strong>FLOSS</strong> == <strong>F</strong>ree/<strong>L</strong>ibre <strong>O</strong>pen <strong>S</strong>ource <strong>S</strong>oftware</p> +</div> +<div class="slide"> +<h1 id="floss---free-software">FLOSS - Free Software</h1> +<p>Free/Libre: Freedom Fighters wanting to <strong>share</strong></p> <ul> -<li><strong>FLOSS</strong> == <strong>F</strong>ree/<strong>L</strong>ibre <strong>O</strong>pen <strong>S</strong>ource <strong>S</strong>oftware</li> -<li>Free/Libre: Freedom Fighters wanting to <strong>share</strong></li> <li>Liberate commons from bounds of competition</li> <li>Bind inventions from being used for competition</li> -<li>Open Source: Business folks wanting to <strong>trade</strong></li> +</ul> +</div> +<div class="slide"> +<h1 id="floss---open-source">FLOSS - Open Source</h1> +<p>Open Source: Business folks wanting to <strong>trade</strong></p> +<ul> <li>Liberate competition</li> <li>Bind commons</li> </ul> -<p>Like "peace": we all want it, but at different cost</p> </div> <div class="slide"> -<h1 id="floss-is-world-peace">FLOSS is World Peace</h1> -<p>Floss: Peaceful cooperation between liberators and liberals</p> +<h1 id="floss-1">FLOSS</h1> +<p><strong>FLOSS</strong> == <strong>F</strong>ree/<strong>L</strong>ibre <strong>O</strong>pen <strong>S</strong>ource <strong>S</strong>oftware</p> +<p>Floss: Friendly cooperation between liberators and liberals</p> +</div> +<div class="slide"> +<h1 id="floss---more-twists-of-words">FLOSS - more twists of words</h1> +<ul> +<li>Free from <strong>some</strong> limits</li> +<li>Choice → Control → Power</li> +<li>(Lack of choice → Simplicity → Usability)</li> +</ul> </div> <div class="slide"> <h1 id="floss-parts">FLOSS parts</h1> |