diff --git a/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml b/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml index a85e8b0c01..af5272d428 100644 --- a/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml +++ b/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml @@ -3,6 +3,30 @@ + + &a.kmoore.email; (2016 - 2020) + + + + &a.jhb.email; (2002 - 2006, 2010 - 2014, 2016 - 2020) + + + + &a.jeff.email; (2018 - 2020) + + + + &a.brooks.email; (2006 - 2012, 2018 - 2020) + + + + &a.bcr.email; (2016 - 2020) + + + + &a.allanjude.email; (2016 - 2020) + + &a.bapt.email; (2016 - 2018) @@ -23,10 +47,6 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> &a.tabthorpe.email; (2012 - 2014) - - &a.jhb.email; (2002 - 2006, 2010 - 2014) - - &a.kib.email; (2010 - 2014) @@ -43,10 +63,6 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0"> &a.wilko.email; (2006 - 2012) - - &a.brooks.email; (2006 - 2012) - - &a.imp.email; (2000 - 2008, 2010 - 2012) diff --git a/en_US.ISO8859-1/books/dev-model/book.xml b/en_US.ISO8859-1/books/dev-model/book.xml index c64e3925ee..3d5b08a61d 100644 --- a/en_US.ISO8859-1/books/dev-model/book.xml +++ b/en_US.ISO8859-1/books/dev-model/book.xml @@ -1301,7 +1301,7 @@ unresolved. - Hat currently held by: &a.jrm.email;. + Hat currently held by: &a.bofh.email;. diff --git a/en_US.ISO8859-1/books/handbook/introduction/chapter.xml b/en_US.ISO8859-1/books/handbook/introduction/chapter.xml index 1133edc7aa..34fec5a301 100644 --- a/en_US.ISO8859-1/books/handbook/introduction/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/introduction/chapter.xml @@ -1035,7 +1035,7 @@ is one of the functions of the core team, as is the recruitment of new core team members as others move on. The current core team was elected from a pool of - committer candidates in July 2018. Elections are held + committer candidates in June 2020. Elections are held every 2 years. diff --git a/en_US.ISO8859-1/htdocs/administration.xml b/en_US.ISO8859-1/htdocs/administration.xml index f142f272fc..079b50b825 100644 --- a/en_US.ISO8859-1/htdocs/administration.xml +++ b/en_US.ISO8859-1/htdocs/administration.xml @@ -92,15 +92,15 @@ Core Team is elected by the active developers in the project.

FreeBSD Documentation Engineering Team @@ -305,7 +305,7 @@ decisions and actions.

    -
  • &a.jrm.email;
    • +
  • &a.bofh.email;

Documentation Engineering Team Secretary diff --git a/share/pgpkeys/core-secretary.key b/share/pgpkeys/core-secretary.key index 13fc7fa3b4..f9afb57260 100644 --- a/share/pgpkeys/core-secretary.key +++ b/share/pgpkeys/core-secretary.key @@ -1,68 +1,83 @@ -sub rsa2048/133C3338A5B95A60 2018-06-30 [E] [expires: 2020-06-29] - Key fingerprint = FA37 B8AA C667 C3AA D310 751D 133C 3338 A5B9 5A60 +sub rsa4096/377C937536E4821B 2020-06-26 [E] [expires: 2022-06-30] ]]> diff --git a/share/pgpkeys/pgpkeys-core.xml b/share/pgpkeys/pgpkeys-core.xml index 5f618de4bc..b7d4c04289 100644 --- a/share/pgpkeys/pgpkeys-core.xml +++ b/share/pgpkeys/pgpkeys-core.xml @@ -4,19 +4,19 @@ $FreeBSD$ --> - - &a.allanjude.email; - &pgpkey.allanjude; + + &a.bapt.email; + &pgpkey.bapt; - - &a.bcr.email; - &pgpkey.bcr; + + &a.emaste.email; + &pgpkey.emaste; - - &a.brooks.email; - &pgpkey.brooks; + + &a.gnn.email; + &pgpkey.gnn; @@ -29,22 +29,19 @@ &pgpkey.imp; - - - - &a.jhb.email; - &pgpkey.jhb; + + &a.kevans.email; + &pgpkey.kevans; - - &a.kmoore.email; - &pgpkey.kmoore; + + &a.markj.email; + &pgpkey.markj; + + + + &a.scottl.email; + &pgpkey.scottl;