Skip to content

Commit

Permalink
shift past talks to new past talk section
Browse files Browse the repository at this point in the history
use people instead of citizens
  • Loading branch information
hpk42 committed Jan 7, 2017
1 parent 28d945d commit 31f0d8c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
18 changes: 12 additions & 6 deletions doc/contact.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,6 @@ and the ACLU_.
Upcoming events
---------------

- Dec 2016: at `33c3`_, Hamburg, scheduled talk at the
`We Fix the Net`_ session and probably another separate one.

- Jan 2017: a prospective lightning talk from dkg at
`RealWorldCrypto 2017`_ in New york

- Mar 2017: Autocrypt sessions at the `Internet Freedom Festival`_
with hackers and users, several Autocrypt-people there.

Expand All @@ -61,3 +55,15 @@ Upcoming events
.. _`RealWorldCrypto 2017`: http://www.realworldcrypto.com/rwc2017

.. _`Internet Freedom Festival`: https://internetfreedomfestival.org/

Past events
-------------

- Dec 2016: at `33c3`_, Hamburg, `holger's autocrypt 15min talk
<https://fossil.net2o.de/33c3/doc/trunk/wiki/autocrypt.md>`_ and
`opportunistic mail panel discussion <https://fossil.net2o.de/33c3/doc/trunk/wiki/panel.md>`_
at the `We Fix the Net`_ sessions.

- Jan 2017: a lightning talk from dkg at
`RealWorldCrypto 2017`_ in New york

2 changes: 1 addition & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ should be as simple as: use an Autocrypt-enabled mail app!**
**Why improve e-mail?** E-Mail has been declared dead many times but
refuses to die. It remains the largest open federated identity and
messaging eco-system, anchors the web, mobiles and continues to relay
sensitive information between citizens and organisations. It has
sensitive information between people and organisations. It has
problems but do you prefer the proprietary, easy-to-track mobile phone
number system to become the single source of digital identification?

Expand Down

0 comments on commit 31f0d8c

Please sign in to comment.