From 056f6d4995698bcd47dfb01dea97126f33d1f40f Mon Sep 17 00:00:00 2001 From: Ben Cotton Date: Nov 30 2020 16:42:44 +0000 Subject: Merge branch 'master' into main --- diff --git a/council/modules/ROOT/pages/history.adoc b/council/modules/ROOT/pages/history.adoc index 6716b64..5136000 100644 --- a/council/modules/ROOT/pages/history.adoc +++ b/council/modules/ROOT/pages/history.adoc @@ -30,6 +30,7 @@ Project Objective Leads |Paul Frields | _Fedora Lifecycle_ | November 2018 – June 2019 |Dominik Perpeet | _CI/CD_ | December 2017 – February 2020 |Langdon White | _Fedora Modularity_ | June 2015 – February 2020 +|Peter Robinson | _Fedora IoT_ | July 2019 – November 2020 |=== Engineering Representative diff --git a/council/modules/ROOT/pages/members.adoc b/council/modules/ROOT/pages/members.adoc index c6957dd..972b04d 100644 --- a/council/modules/ROOT/pages/members.adoc +++ b/council/modules/ROOT/pages/members.adoc @@ -44,10 +44,6 @@ Read more about the xref:fcaic.adoc[Fedora Community Action and Impact Coordinat Read more about the xref:fpgm.adoc[Fedora Program Manager's role] and the current FPgM's xref:fpgm.adoc[biography] on the page about this position. * Objective Leads: -** *Peter Robinson* (Internet of Things) -+ -Peter is the lead architect for Linux IoT platforms at Red Hat. He's be at Red Hat over five years and done a number of roles, he's been an Open Source user and contributor since the mid 1990s, and has wide experience in IT from SME, large Telco/hosting providers and quite a bit in between. He's been working on IoT for a number of years, with specific interest in agriculture due to growing up on a farm in country Australia. - ** *Adam Šamalík* (Minimization) + Open source enthusiast. Senior software engineer with Red Hat working on Fedora. Linux user since 2007, Fedora community member since 2014. diff --git a/engineering/antora.yml b/engineering/antora.yml index f2aa43d..edd84ec 100644 --- a/engineering/antora.yml +++ b/engineering/antora.yml @@ -5,8 +5,8 @@ name: engineering # <---- PLEASE MODIFY # Title will be visible on the page. title: Engineering Teams # <---- PLEASE MODIFY -# If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "main" to a specific version. -version: main +# If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "master" to a specific version. +version: master # We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. start_page: ROOT:index diff --git a/mindshare/antora.yml b/mindshare/antora.yml index 65a46e7..b652af1 100644 --- a/mindshare/antora.yml +++ b/mindshare/antora.yml @@ -5,8 +5,8 @@ name: mindshare # <---- PLEASE MODIFY # Title will be visible on the page. title: Mindshare Teams # <---- PLEASE MODIFY -# If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "main" to a specific version. -version: main +# If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "master" to a specific version. +version: master # We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. start_page: ROOT:index diff --git a/project/antora.yml b/project/antora.yml index 20f8c54..30b39aa 100644 --- a/project/antora.yml +++ b/project/antora.yml @@ -5,8 +5,8 @@ name: project # Title will be visible on the page. title: Fedora Project -# If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "main" to a specific version. -version: main +# If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "master" to a specific version. +version: master # We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. start_page: ROOT:index