diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2012-11-07 00:22:06 +0100 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2012-11-07 00:22:06 +0100 |
| commit | a63316263f04063791c8b125ec17e00500c53444 (patch) | |
| tree | 974d6b43648f84a3ec841c8984c645ffcbf04c28 /fb/talk | |
| parent | cd1ba999955d95c0c7ed20a2b1b13bd0efddb562 (diff) | |
Update rendered html.
Diffstat (limited to 'fb/talk')
| -rw-r--r-- | fb/talk/epfsug2/index.html | 40 |
1 files changed, 31 insertions, 9 deletions
diff --git a/fb/talk/epfsug2/index.html b/fb/talk/epfsug2/index.html index 464a47f..7780045 100644 --- a/fb/talk/epfsug2/index.html +++ b/fb/talk/epfsug2/index.html @@ -52,13 +52,17 @@ Jonas Smedegaard </div> <div class="section slide level1" id="multinational-companies-centralize-data-flow"> <h1>Multinational companies centralize data flow</h1> -<p>skema: points and synapses → blue multipoint-to-dotted-line-to-point → red point-to-point</p> -<p>(dots are logos)</p> +<div class="figure"> +<img src="connect-direct-central.png" /><p class="caption"></p> +</div> +<p>(FIXME: dots are logos)</p> </div> <div class="section slide level1" id="or...-we-asked-for-it-supply-and-demand"> <h1>Or...: We asked for it (supply and demand)</h1> -<p>skema: points and synapses → blue multipoint-to-dotted-line-to-point → red point-to-point</p> -<p>(dots are dots)</p> +<div class="figure"> +<img src="connect-direct-central.png" /><p class="caption"></p> +</div> +<p>(FIXME: dots are dots)</p> </div> <div class="section slide level1" id="freedombox-can-change-the-game"> <h1>FreedomBox can change the game</h1> @@ -68,7 +72,9 @@ Jonas Smedegaard </div> <div class="section slide level1" id="blabla-how-it-can-change-the-game"> <h1>blabla how it can change the game</h1> -<p>skema: red point-to-point → blue (red at end) multipoint-to-dotted-line-to-to-freedombox-to-point</p> +<div class="figure"> +<img src="connect-central-fb.png" /><p class="caption"></p> +</div> </div> <div class="section slide level1" id="communication-in-the-ep"> <h1>Communication in the EP</h1> @@ -138,9 +144,19 @@ Jonas Smedegaard <li>"Wauw"</li> </ul> </div> -<div class="section slide level1" id="hedgehog-and-freedombox"> -<h1>Hedgehog and FreedomBox</h1> -<p>Skema: using Linux in the EP, directly and via proxy</p> +<div class="section slide level1" id="what-does-freedombox-do-2"> +<h1>What does FreedomBox do?</h1> +<p>Examples:</p> +<ul> +<li>"Hello" → like phone, but intelligent</li> +<li>"Wauw" → like twitter, but intelligence is yours</li> +</ul> +</div> +<div class="section slide level1" id="hedgehog"> +<h1>Hedgehog</h1> +<div class="figure"> +<img src="msmail.jpg" /><p class="caption"></p> +</div> </div> <div class="section slide level1" id="hedgehog-needs-freedombox"> <h1>Hedgehog needs FreedomBox</h1> @@ -148,6 +164,12 @@ Jonas Smedegaard <img src="hedgehog.jpg" /><p class="caption"></p> </div> </div> +<div class="section slide level1" id="freedombox-as-aid-for-hedgehog"> +<h1>FreedomBox as aid for Hedgehog</h1> +<div class="figure"> +<img src="fboxmail.jpg" /><p class="caption"></p> +</div> +</div> <div class="section slide level1" id="hedgehog-and-freedombox-needs-us"> <h1>Hedgehog and FreedomBox needs us</h1> <div class="figure"> @@ -181,7 +203,7 @@ Jonas Smedegaard <div class="section slide level1" id="where-to-best-do-which-types-of-hacking"> <h1>Where to best do which types of hacking</h1> <div class="figure"> -<img src="developmentstream.png" /><p class="caption"></p> +<img src="developmentstream.jpg" /><p class="caption"></p> </div> </div> <div class="section slide level1" id="same-vision-but-maybe-multiple-goals"> |