Date: Tue, 14 Jul 2015 20:48:37 +0000 (UTC) From: Matthew Seaman <matthew@FreeBSD.org> 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 Message-ID: <201507142048.t6EKmbJR039598@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 @@ <p>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.</p> @@ -110,12 +110,12 @@ <h2>In Case of Conflict</h2> <ul> - <li>Backout contentious changes first, then argue your + <li>Back out contentious changes first, then argue your case.</li> <li>Ask for review.</li> <li>Seek approval from maintainers.</li> <li>When no mutually satisfactory resolution can be achieved, - defer to security-officer, doceng, portmgr or core</li> + defer to security-officer, doceng, portmgr, or core</li> </ul> <p>If there are a sustained set of objections to a change you @@ -133,7 +133,7 @@ <p>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 @@ <p>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 <a href="../administration.html">specific teams</a>. 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.</p> </body>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507142048.t6EKmbJR039598>