From owner-svn-doc-head@freebsd.org Tue Jul 14 20:48:38 2015 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E652F9A1748; Tue, 14 Jul 2015 20:48:37 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CA1BF2218; Tue, 14 Jul 2015 20:48:37 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6EKmb8X039599; Tue, 14 Jul 2015 20:48:37 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6EKmbJR039598; Tue, 14 Jul 2015 20:48:37 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201507142048.t6EKmbJR039598@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Tue, 14 Jul 2015 20:48:37 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46979 - head/en_US.ISO8859-1/htdocs/internal X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jul 2015 20:48:38 -0000 Author: matthew (ports committer) Date: Tue Jul 14 20:48:36 2015 New Revision: 46979 URL: https://svnweb.freebsd.org/changeset/doc/46979 Log: Improvements and fixes suggested by Warren Block. With hat: core-secretary Submitted by: wblock Approved by: core Modified: head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml Modified: head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml ============================================================================== --- head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml Tue Jul 14 20:11:18 2015 (r46978) +++ head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml Tue Jul 14 20:48:36 2015 (r46979) @@ -61,7 +61,7 @@

Conflict is inevitable, but unseemly conduct is not. If you must disagree forcefully, do so within the appropriate technical discussion group and in a manner that will be acceptable to your - audience. Stay focussed on the topic at hand. Heated + audience. Stay focused on the topic at hand. Heated arguments have a way of dragging in bystanders and mutating until the original point is lost.

@@ -110,12 +110,12 @@

In Case of Conflict

    -
  • Backout contentious changes first, then argue your +
  • Back out contentious changes first, then argue your case.
  • Ask for review.
  • Seek approval from maintainers.
  • When no mutually satisfactory resolution can be achieved, - defer to security-officer, doceng, portmgr or core
    • + defer to security-officer, doceng, portmgr, or core

If there are a sustained set of objections to a change you @@ -133,7 +133,7 @@

It is strongly encouraged that you consult maintainers before making changes in their particular areas, although in many areas some teams have given blanket approval for certain types of - change. For instance, various types of sweeping update to the + change. For instance, various types of sweeping updates to the ports are permitted without reference to individual port maintainers. It is the duty of committers and maintainers to keep up-to-date with such standards and practices, and abide by @@ -143,12 +143,12 @@

If you cannot agree, who should you turn to for arbitration? Core itself is directly responsible for the base system, but has - devolved control over ports, documentation, release engineering + delegated control over ports, documentation, release engineering and security related functions to sub-committees. Operational control of &os; cluster servers, user accounts, e-mail, various web-based and other services have been similarly devolved to specific teams. These teams - are the first line of resort should disputes prove insoluble and + are the first line of resort when disputes cannot be resolved and require mediation. Failing that, a decision by core will be final.