diff --git a/en/developers.sgml b/en/developers.sgml index 42bb47b609..7c384cbe92 100644 --- a/en/developers.sgml +++ b/en/developers.sgml @@ -1,198 +1,195 @@ - - - diff --git a/en/internal/Makefile b/en/internal/Makefile index 041fa18c9f..c1ec1d8fc5 100644 --- a/en/internal/Makefile +++ b/en/internal/Makefile @@ -1,47 +1,46 @@ -# $FreeBSD: www/en/internal/Makefile,v 1.41 2005/01/28 16:52:17 imp Exp $ +# $FreeBSD: www/en/internal/Makefile,v 1.42 2005/03/12 07:37:56 linimon 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+= statistic.sgml DOCS+= developer.sgml DOCS+= bylaws.sgml DOCS+= releng.sgml DOCS+= expire-bits.sgml DOCS+= core-vote.sgml -DOCS+= trb-dispute.sgml DOCS+= doceng.sgml DOCS+= rtp.sgml DOCS+= policies.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 .if !make(install) .PHONY: homepage.inc .endif 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 deleted file mode 100644 index 8376841b4f..0000000000 --- a/en/internal/trb-dispute.sgml +++ /dev/null @@ -1,52 +0,0 @@ - - - - %includes; -]> - - - &header; - -

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; - -