diff --git a/en/internal/Makefile b/en/internal/Makefile index e0cce4bd17..05f0e59c5d 100644 --- a/en/internal/Makefile +++ b/en/internal/Makefile @@ -1,43 +1,44 @@ -# $FreeBSD: www/en/internal/Makefile,v 1.33 2003/02/09 00:09:19 trhodes Exp $ +# $FreeBSD: www/en/internal/Makefile,v 1.34 2003/02/09 00:10:03 trhodes Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" .endif .if exists(../Makefile.inc) .include "../Makefile.inc" .endif DOCS= photos.sgml DOCS+= internal.sgml DOCS+= about.sgml DOCS+= machines.sgml DOCS+= mirror.sgml DOCS+= new-account.sgml DOCS+= staff.sgml DOCS+= statistic.sgml DOCS+= developer.sgml DOCS+= bylaws.sgml DOCS+= releng.sgml DOCS+= releng45.sgml DOCS+= expire-bits.sgml DOCS+= core-vote.sgml +DOCS+= trb-dispute.sgml INDEXLINK= internal.html # build the list of personal homepages of FreeBSD developers only # on the main FreeBSD machines hostname!= hostname .if ${hostname} == "hub.freebsd.org" || ${hostname} == "freefall.freebsd.org" || ${hostname} == "www.freebsd.org" DOCS+= homepage.sgml .PHONY: homepage.inc homepage.inc: homepage.pl ${PERL} ${.CURDIR}/homepage.pl > ${.TARGET} homepage.html: homepage.inc CLEANFILES+= homepage.inc .endif DATA+= README.mirror ssh-keys.asc .include "${WEB_PREFIX}/share/mk/web.site.mk" diff --git a/en/internal/trb-dispute.sgml b/en/internal/trb-dispute.sgml new file mode 100644 index 0000000000..5826411db9 --- /dev/null +++ b/en/internal/trb-dispute.sgml @@ -0,0 +1,53 @@ + + + %includes; +]> + + + &header; + +

TRB Dispute Resolution:

+ +

This document outlines the procedure that the Technical Review Board (TRB) + follows when resolving disagreements of a technical nature. This document + does not describe the whole of the TRB responsibilities and procedures. + If at any time during the resolution of the conflict the two parties come + to a mutual agreement the TRB arbitration process will end.

+ +

A technical dispute is brought to the TRB. This may happen at the + request of a participant in a deadlocked dispute. It may also happen + if it becomes clear to a member of the TRB or core that the disputing + parties are not able to resolve the issue in a timely or professional + manner.

+ +

The TRB will announce on arch@ that it is considering an issue. A + request is made for all interested parties to submit one email + stating their position on this issue to the trb@ mailing list. These + emails are available to all committers via the trb archive.

+ +

The TRB makes requests of those who have submitted their opinions on + the subject to clarify points. This discussion will continue on the + trb@ list. If possible the TRB will steer the involved parties + towards resolving the issue themselves.

+ +

A member of the TRB produces a brief document describing the core + technical issues and a summary of the opinions of either side. If + the involved parties can not come to a conclusion themselves the + TRB will decide on a best plan of action based on the facts + presented.

+ +

A vote is held on trb-private@. This is done privately to mitigate + any impressions of bias either way from individual members of TRB. + If a member of TRB has some non technical interest in the vote they + are required to abstain from voting.

+ +

The results of the private vote are announced on arch@ and trb@. + This will include a short statement detailing the position of the + TRB on this issue and the number of votes for each option. The + decision will be based on a majority vote. The results are + considered final and all appeals must go through core@.

+ + &footer; + +