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 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 |
IMGS = imgs/network-private.png imgs/network-public.png imgs/network-community.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 dia -e $@ -s 1024x $< imgs/network-public.png: diagrams/network-public.dia dia -e $@ -s 1024x $< imgs/network-community.png: diagrams/network-community.dia dia -e $@ -s 1024x $< clean: rm -f $(IMGS) $(IMGS_BEAMER) slides,lightning.pdf slides,lightning.html |
| > > > > > > > > |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 |
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 dia -e $@ -s 1024x $< 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 version [2ac9fba729].
cannot compute difference between binary files
Modified script,lightning.txt from [2453919f3b] to [db58632d7b].
18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 |
neutral networks, values in consonance with the Free software movement. Some CNs even have mutual agreement texts similar to Free software liceses. - 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. - 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 knowledge for researchers to experiment on real CNs. *##* |
| |
18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 |
neutral networks, values in consonance with the Free software movement. Some CNs even have mutual agreement texts similar to Free software liceses. - 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. *##* - 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 knowledge for researchers to experiment on real CNs. *##* |
Modified slides,lightning.txt from [a009c282eb] to [077fc3ef2f].
32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 |
distributed ownership - Open, Free, neutral networks - Mutual agreement texts - Key for EU Digital Agenda # The CONFINE project - Partners: - CNs: guifi.net, Funkfeuer, AWMN - Research: UPC, FKIE, iMinds - NGOs: Pangea, OPLAN <!--- logos ---> - Support sustainable growth of CNs via research (technologies & services) - Help other projects boost CNs (Open Calls) <!--- OC1 & OC2 project listing ---> - Provide a testbed for CNs: Community-Lab # Community-Lab |
| | | | | > > > > > > > > > |
32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 |
distributed ownership - Open, Free, neutral networks - Mutual agreement texts - Key for EU Digital Agenda # The CONFINE project - Partners **[+]** - Support sustainable growth of CNs via research (technologies & services) - Help other projects boost CNs (Open Calls) <!--- OC1 & OC2 project listing ---> - 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) <!--- OC1 & OC2 project listing ---> - Provide a testbed for CNs: Community-Lab # Community-Lab |