Overview
| Comment: | Add drawing with CONFINE project partners. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | fosdem-2014 |
| Files: | files | file ages | folders |
| SHA1: | 9c1107410d8f221b8720b26b30459582 |
| User & Date: | ivan on 2014-01-29 15:31:21 |
| Other Links: | manifest | tags |
Context
|
2014-01-29
| ||
| 15:48 | Add list of OC1 and OC2 projects. check-in: 9c9242aa05 user: ivan tags: fosdem-2014 | |
| 15:31 | Add drawing with CONFINE project partners. check-in: 9c1107410d user: ivan tags: fosdem-2014 | |
| 14:53 | Paint links to the Internet with owner's colour. check-in: a9b19e6e91 user: ivan tags: fosdem-2014 | |
Changes
Modified Makefile from [f582cd5b0e] to [66bee2a0ff].
1 -IMGS = imgs/network-private.png imgs/network-public.png imgs/network-community.png 1 +IMGS = imgs/network-private.png imgs/network-public.png imgs/network-community.png \ 2 + imgs/confine-partners.png 2 3 IMGS_BEAMER = imgs/confine,background.pdf 4 + 3 5 4 6 .PHONY: clean 5 7 6 8 all: slides,lightning.pdf 9 + 7 10 8 11 slides,lightning.pdf: slides,lightning.txt $(IMGS) slides-header.tex $(IMGS_BEAMER) 9 12 pandoc -t beamer -H slides-header.tex slides,lightning.txt -o $@ 10 13 11 14 slides,lightning.html: slides,lightning.txt $(IMGS) 12 15 pandoc -t dzslides --self-contained slides,lightning.txt -o $@ 16 + 13 17 14 18 imgs/confine,background.pdf: logos/confine,logo.svg 15 19 inkscape -z -D -A $@ $< 16 20 17 21 imgs/network-private.png: diagrams/network-private.dia 18 22 dia -e $@ -s 1024x $< 19 23 20 24 imgs/network-public.png: diagrams/network-public.dia 21 25 dia -e $@ -s 1024x $< 22 26 23 27 imgs/network-community.png: diagrams/network-community.dia 24 28 dia -e $@ -s 1024x $< 29 + 30 +imgs/confine-partners.png: logos/confine-partners.svg 31 + inkscape -z -C -e $@ -w 1024 $< 32 + 25 33 26 34 clean: 27 35 rm -f $(IMGS) $(IMGS_BEAMER) slides,lightning.pdf slides,lightning.html
Added logos/confine-partners.svg version [2ac9fba729].
cannot compute difference between binary files
Modified script,lightning.txt from [2453919f3b] to [db58632d7b].
18 18 neutral networks, values in consonance with the Free software movement. 19 19 Some CNs even have mutual agreement texts similar to Free software liceses. 20 20 - Atypical as it may seem, the EU in its Digital Agenda regards CNs as 21 21 fundamental for the universalization of broadband networking. *##* 22 22 23 23 ** The CONFINE project 24 24 - Under the umbrella of the Digital Agenda, CONFINE is a EU-financed project 25 - with several partners: CNs, research institutions and supporting NGOs. 25 + with several partners: *##* CNs, research institutions and supporting NGOs. *##* 26 26 - Its mission is to support the sustainable growth of CNs by providing the 27 27 means to conduct experimentally driven research. 28 28 - It also supports other projects advancing or extending CNs via financed Open 29 29 Calls (which are now closed). 30 30 - Last but not least, CONFINE provides a testbed and the associated tools and 31 31 knowledge for researchers to experiment on real CNs. *##* 32 32
Modified slides,lightning.txt from [a009c282eb] to [077fc3ef2f].
32 32 distributed ownership 33 33 - Open, Free, neutral networks 34 34 - Mutual agreement texts 35 35 - Key for EU Digital Agenda 36 36 37 37 # The CONFINE project 38 38 39 -- Partners: 40 - - CNs: guifi.net, Funkfeuer, AWMN 41 - - Research: UPC, FKIE, iMinds 42 - - NGOs: Pangea, OPLAN 43 -<!--- logos ---> 39 +- Partners **[+]** 40 +- Support sustainable growth of CNs via research 41 + (technologies & services) 42 +- Help other projects boost CNs (Open Calls) 43 +<!--- OC1 & OC2 project listing ---> 44 +- Provide a testbed for CNs: Community-Lab 45 + 46 +# … partners 47 + 48 + 49 + 50 +# The CONFINE project 51 + 52 +- Partners 44 53 - Support sustainable growth of CNs via research 45 54 (technologies & services) 46 55 - Help other projects boost CNs (Open Calls) 47 56 <!--- OC1 & OC2 project listing ---> 48 57 - Provide a testbed for CNs: Community-Lab 49 58 50 59 # Community-Lab