Merge branch 'staging' into 'production'

Fixes to DG102, updated README

See merge request cccb/www!12
This commit is contained in:
Daniel Molkentin 2019-09-04 21:50:34 +02:00
commit 66419dce2e
2 changed files with 10 additions and 9 deletions

View file

@ -8,7 +8,7 @@ Running a dev setup
* Switch directory: `cd www` * Switch directory: `cd www`
* Fetch Submodules: `git submodule update --recursive --remote --init` * Fetch Submodules: `git submodule update --recursive --remote --init`
* run hugo webserver: `hugo serve` * run hugo webserver: `hugo serve`
* Point your browser to `http://localhost:1313/s/` * Point your browser to `http://localhost:1313/`
* To ready your site for upload, run "./build.sh", which also generates all.ics * To ready your site for upload, run "./build.sh", which also generates all.ics
and adds the calendar table to index.html and adds the calendar table to index.html

View file

@ -13,7 +13,7 @@ event:
location: CCCB location: CCCB
language: en language: en
streaming: true streaming: true
recording: recording: http://streaming.media.ccc.de/datengarten
--- ---
In today's hyper-connected society, everyone constantly uses their smartphone, In today's hyper-connected society, everyone constantly uses their smartphone,
which in turn uses the commercial cellular networks (from 2G/GSM to 4G/LTE) which in turn uses the commercial cellular networks (from 2G/GSM to 4G/LTE)
@ -23,6 +23,7 @@ behind those cellular networks looks like.
This talk does not cover the architecture and protocols of underlying This talk does not cover the architecture and protocols of underlying
cellular systems, but focuses on the physical side of things: cellular systems, but focuses on the physical side of things:
* what are the typical components of cellular base stations? * what are the typical components of cellular base stations?
* what are their key functionalities? * what are their key functionalities?
* how did cellular base station technology evolve during the past 20 years? * how did cellular base station technology evolve during the past 20 years?
@ -31,10 +32,10 @@ cellular systems, but focuses on the physical side of things:
We will not cover DIY or hobbyist projects here, but the actual technology deployed We will not cover DIY or hobbyist projects here, but the actual technology deployed
in the field by real-world commercial operators. in the field by real-world commercial operators.
About the speaker: #### About the speaker
Harald Welte is a CCC member since the 1990ies, developing Free Software Harald Welte is a CCC member since the 1990ies, developing Free Software
for more than 20 years, has a prior life as Linux Kernel developer. He has for more than 20 years, has a prior life as Linux Kernel developer. He has
founded the Osmocom project (https://osmocom.org/) about 10 years ago founded the [Osmocom project](https://osmocom.org/) about 10 years ago
and focused his life on implementing cellular protocols, interfaces and and focused his life on implementing cellular protocols, interfaces and
network elements as Free Software. network elements as Free Software.