From 6d642eec1e3e1dbfa129cd3074ac263461be21c3 Mon Sep 17 00:00:00 2001 From: Molly de Blanc Date: Tue, 20 Mar 2018 10:13:45 -0400 Subject: [PATCH] updated web site to include mako --- 2018/includes/generated-bios.html | 28 ++++++++++++++++++++++++--- 2018/includes/generated-sessions.html | 24 +++++++++++------------ 2 files changed, 37 insertions(+), 15 deletions(-) diff --git a/2018/includes/generated-bios.html b/2018/includes/generated-bios.html index 7cb26bfd..f455ccec 100644 --- a/2018/includes/generated-bios.html +++ b/2018/includes/generated-bios.html @@ -2,15 +2,37 @@

Keynote speakers

+
-[ Deb Nicholson - Photo ] +[ Benj. Mako Hill - Photo ]
+
+
+

Benjamin Mako Hill

+
+
+

Benjamin Mako Hill is a social scientist, technologist, and activist. In all three roles, he works to understand why some attempts at peer production — like Wikipedia and GNU/Linux — build large volunteer communities while the vast majority never attract even a second contributor. He is an Assistant Professor in the Department of Communication at the University of Washington. He is also a faculty affiliate at the Berkman Center for Internet and Society and an affiliate at the Institute for Quantitative Social Science — both at Harvard University. He has also been a leader, developer, and contributor to the free software community for more than a decade as part of the Debian and Ubuntu projects. He is the author of several best-selling technical books, a member of the Free Software Foundation board of directors and an advisor to the Wikimedia Foundation. Hill has a Masters degree from the MIT Media Lab and a PhD from MIT in an interdepartmental program between the Sloan School of Management and the Media Lab.

+

Photo of Benjamin Mako Hill by Mika Matsuzaki CC-BY 4.0 US

+
+
+
+ + +
+ +
+ +
+[ Deb Nicholson - Photo ] +
+ +

Deb Nicholson

@@ -19,8 +41,8 @@

Deb Nicholson is a free software policy expert and a passionate community advocate. She is the Community Outreach Director for the Open Invention Network, the world's largest patent non-aggression community, which serves GNU, the kernel Linux, Android, and other key free software projects.

She won the O’Reilly Open Source Award for her work with GNU MediaGoblin and OpenHatch. She is a founding organizer of the Seattle GNU/Linux Conference, an annual event dedicated to surfacing new voices and welcoming new people to the free software community. She also serves on the Software Freedom Conservancy's Evaluation Committee, which acts as a curator for new member projects. She lives with her husband and her lucky black cat in Cambridge, Massachusetts.

Photo of Deb Nicholson by Misty Smith CC-BY-NC-SA 2.0

-
-
+ +
diff --git a/2018/includes/generated-sessions.html b/2018/includes/generated-sessions.html index 6aaca127..6b4b5ae4 100644 --- a/2018/includes/generated-sessions.html +++ b/2018/includes/generated-sessions.html @@ -14,7 +14,7 @@
-

10:00 - 10:45

+

10:00 - 10:45 - Keynote

@@ -28,7 +28,7 @@
-34-101 +32-123
-34-101 +32-123
-34-101 +32-123
-34-101 +32-123
-34-101 +32-123
-34-101 +32-123
-34-101 +32-123
-34-101 +32-123