From bad7c214a0882632356f66e7e9cdc4d3344829ae Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Mon, 9 Oct 2000 17:08:39 +0000 Subject: [PATCH] We do not have a Principal Architect any longer. --- .../articles/committers-guide/article.sgml | 30 ++++++++----------- .../articles/committers-guide/article.sgml | 30 ++++++++----------- 2 files changed, 26 insertions(+), 34 deletions(-) diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 602e35c8c0..2ca0c67b16 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -16,7 +16,7 @@ - $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.39 2000/10/02 04:23:21 obrien Exp $ + $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.40 2000/10/02 08:31:25 alex Exp $ 1999 @@ -512,11 +512,11 @@ You'll almost certainly get a conflict because - of the $Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.41 2000-10-09 17:08:39 obrien Exp $ (or in FreeBSD's case, $FreeBSD$) lines, so you'll have to edit the file to resolve the conflict (remove the marker lines and - the second $Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $ line, leaving the original - $Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $ line intact). + the second $Id: article.sgml,v 1.41 2000-10-09 17:08:39 obrien Exp $ line, leaving the original + $Id: article.sgml,v 1.41 2000-10-09 17:08:39 obrien Exp $ line intact). @@ -1038,13 +1038,9 @@ docs:Documentation Bug:nik: &a.dg; - David is our principal architect and overseer of the + David is the overseer of the VM system. If you have a VM system change in mind, - coordinate it with David. Should you become locked in a - bitter, intractable dispute with some other committer over - a proposed change (which does not happen very often, - thankfully) then an appeal to David to put on his P.A. hat - and make a final decision might be necessary. + coordinate it with David. @@ -1190,8 +1186,8 @@ docs:Documentation Bug:nik: Any disputed change must be backed out pending - resolution of the dispute if requested by a maintainer or - the Principal Architect. Security related changes may + resolution of the dispute if requested by a maintainer. + Security related changes may override a maintainer's wishes at the Security Officer's discretion. @@ -1206,7 +1202,7 @@ docs:Documentation Bug:nik: merging so that it can be given sufficient testing. The release engineer has the same authority over the -STABLE branch as outlined for the - Principal Architect in rule #5. + maintainer in rule #5. @@ -1232,8 +1228,8 @@ docs:Documentation Bug:nik: As noted, breaking some of these rules can be grounds for suspension or, upon repeated offense, permanent removal of - commit privileges. Three or more members of core, or the - Principal Architect and another member of core acting in unison, + commit privileges. Three or more members of core + acting in unison, have the power to temporarily suspend commit privileges until -core as a whole has the chance to review the issue. In case of an emergency (a committer @@ -1386,8 +1382,8 @@ docs:Documentation Bug:nik: Any disputed change must be backed out pending - resolution of the dispute if requested by a maintainer or - the Principal Architect. Security related changes may + resolution of the dispute if requested by a maintainer + Security related changes may override a maintainer's wishes at the Security Officer's discretion. diff --git a/en_US.ISO_8859-1/articles/committers-guide/article.sgml b/en_US.ISO_8859-1/articles/committers-guide/article.sgml index 602e35c8c0..2ca0c67b16 100644 --- a/en_US.ISO_8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO_8859-1/articles/committers-guide/article.sgml @@ -16,7 +16,7 @@ - $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.39 2000/10/02 04:23:21 obrien Exp $ + $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.40 2000/10/02 08:31:25 alex Exp $ 1999 @@ -512,11 +512,11 @@ You'll almost certainly get a conflict because - of the $Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.41 2000-10-09 17:08:39 obrien Exp $ (or in FreeBSD's case, $FreeBSD$) lines, so you'll have to edit the file to resolve the conflict (remove the marker lines and - the second $Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $ line, leaving the original - $Id: article.sgml,v 1.40 2000-10-02 08:31:25 alex Exp $ line intact). + the second $Id: article.sgml,v 1.41 2000-10-09 17:08:39 obrien Exp $ line, leaving the original + $Id: article.sgml,v 1.41 2000-10-09 17:08:39 obrien Exp $ line intact). @@ -1038,13 +1038,9 @@ docs:Documentation Bug:nik: &a.dg; - David is our principal architect and overseer of the + David is the overseer of the VM system. If you have a VM system change in mind, - coordinate it with David. Should you become locked in a - bitter, intractable dispute with some other committer over - a proposed change (which does not happen very often, - thankfully) then an appeal to David to put on his P.A. hat - and make a final decision might be necessary. + coordinate it with David. @@ -1190,8 +1186,8 @@ docs:Documentation Bug:nik: Any disputed change must be backed out pending - resolution of the dispute if requested by a maintainer or - the Principal Architect. Security related changes may + resolution of the dispute if requested by a maintainer. + Security related changes may override a maintainer's wishes at the Security Officer's discretion. @@ -1206,7 +1202,7 @@ docs:Documentation Bug:nik: merging so that it can be given sufficient testing. The release engineer has the same authority over the -STABLE branch as outlined for the - Principal Architect in rule #5. + maintainer in rule #5. @@ -1232,8 +1228,8 @@ docs:Documentation Bug:nik: As noted, breaking some of these rules can be grounds for suspension or, upon repeated offense, permanent removal of - commit privileges. Three or more members of core, or the - Principal Architect and another member of core acting in unison, + commit privileges. Three or more members of core + acting in unison, have the power to temporarily suspend commit privileges until -core as a whole has the chance to review the issue. In case of an emergency (a committer @@ -1386,8 +1382,8 @@ docs:Documentation Bug:nik: Any disputed change must be backed out pending - resolution of the dispute if requested by a maintainer or - the Principal Architect. Security related changes may + resolution of the dispute if requested by a maintainer + Security related changes may override a maintainer's wishes at the Security Officer's discretion.