Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -1,17 +1,21 @@ -IMGS = imgs/network-private.png imgs/network-public.png imgs/network-community.png +IMGS = imgs/network-private.png imgs/network-public.png imgs/network-community.png \ + imgs/confine-partners.png IMGS_BEAMER = imgs/confine,background.pdf + .PHONY: clean all: slides,lightning.pdf + slides,lightning.pdf: slides,lightning.txt $(IMGS) slides-header.tex $(IMGS_BEAMER) pandoc -t beamer -H slides-header.tex slides,lightning.txt -o $@ slides,lightning.html: slides,lightning.txt $(IMGS) pandoc -t dzslides --self-contained slides,lightning.txt -o $@ + imgs/confine,background.pdf: logos/confine,logo.svg inkscape -z -D -A $@ $< imgs/network-private.png: diagrams/network-private.dia @@ -20,8 +24,12 @@ imgs/network-public.png: diagrams/network-public.dia dia -e $@ -s 1024x $< imgs/network-community.png: diagrams/network-community.dia dia -e $@ -s 1024x $< + +imgs/confine-partners.png: logos/confine-partners.svg + inkscape -z -C -e $@ -w 1024 $< + clean: rm -f $(IMGS) $(IMGS_BEAMER) slides,lightning.pdf slides,lightning.html ADDED logos/confine-partners.svg Index: logos/confine-partners.svg ================================================================== --- logos/confine-partners.svg +++ logos/confine-partners.svg cannot compute difference between binary files Index: script,lightning.txt ================================================================== --- script,lightning.txt +++ script,lightning.txt @@ -20,11 +20,11 @@ - Atypical as it may seem, the EU in its Digital Agenda regards CNs as fundamental for the universalization of broadband networking. *##* ** The CONFINE project - Under the umbrella of the Digital Agenda, CONFINE is a EU-financed project - with several partners: CNs, research institutions and supporting NGOs. + with several partners: *##* CNs, research institutions and supporting NGOs. *##* - Its mission is to support the sustainable growth of CNs by providing the means to conduct experimentally driven research. - It also supports other projects advancing or extending CNs via financed Open Calls (which are now closed). - Last but not least, CONFINE provides a testbed and the associated tools and Index: slides,lightning.txt ================================================================== --- slides,lightning.txt +++ slides,lightning.txt @@ -34,15 +34,24 @@ - Mutual agreement texts - Key for EU Digital Agenda # The CONFINE project -- Partners: - - CNs: guifi.net, Funkfeuer, AWMN - - Research: UPC, FKIE, iMinds - - NGOs: Pangea, OPLAN - +- Partners **[+]** +- Support sustainable growth of CNs via research + (technologies & services) +- Help other projects boost CNs (Open Calls) + +- Provide a testbed for CNs: Community-Lab + +# … partners + +![CONFINE project partners](imgs/confine-partners.png) + +# The CONFINE project + +- Partners - Support sustainable growth of CNs via research (technologies & services) - Help other projects boost CNs (Open Calls) - Provide a testbed for CNs: Community-Lab