From owner-svn-doc-all@freebsd.org Tue Jul 14 21:24:43 2015 Return-Path: Delivered-To: svn-doc-all@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 80FCD9A1135; Tue, 14 Jul 2015 21:24:43 +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 4E7D31B0E; Tue, 14 Jul 2015 21:24:43 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from svnmir.geo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6ELOhiW059396; Tue, 14 Jul 2015 21:24:43 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by svnmir.geo.freebsd.org (8.14.9/8.14.9/Submit) id t6ELOhoc059395; Tue, 14 Jul 2015 21:24:43 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201507142124.t6ELOhoc059395@svnmir.geo.freebsd.org> X-Authentication-Warning: svnmir.geo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Tue, 14 Jul 2015 21:24:43 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r46980 - 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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jul 2015 21:24:43 -0000 Author: matthew (ports committer) Date: Tue Jul 14 21:24:42 2015 New Revision: 46980 URL: https://svnweb.freebsd.org/changeset/doc/46980 Log: More clarifications and imrovements to wording With hat: core-secretary Submitted by: phk 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:48:36 2015 (r46979) +++ head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml Tue Jul 14 21:24:42 2015 (r46980) @@ -23,8 +23,7 @@ this Code of Conduct. This not only includes developers and contributors to &os; but also anyone posting to &os; mailing lists or using the &os; Forums or chatting on &os; specific IRC - channels, or otherwise interacting with members of the &os; - community.

+ channels, or otherwise interacting with the &os; community.

Each individual's behaviour is primarily a matter for their personal conscience. Even so, there are limits whose breach @@ -102,16 +101,16 @@ third party to behave in such a way towards any members of the &os; community.

-

Core may remove any and all access to &os; resources or +

Core will remove any and all access to &os; resources or privileges for whatever period it deems fit, up to and including - a permanent ban where such transgression has been - demonstrated.

+ a permanent ban where it rules that a transgression has + happened.

In Case of Conflict

    -
  • Back out contentious changes first, then argue your - case.
    • +
  • If contested, back out your changes first, then argue your + case.
  • Ask for review.
  • Seek approval from maintainers.
  • When no mutually satisfactory resolution can be achieved,