svn commit: r46980 - head/en_US.ISO8859-1/htdocs/internal

[Matthew Seaman]

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.</p>
+      channels, or otherwise interacting with the &os; community.</p>
 
     <p>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.</p>
 
-    <p>Core may remove any and all access to &os; resources or
+    <p>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.</p>
+      a permanent ban where it rules that a transgression has
+      happened.</p>
 
     <h2>In Case of Conflict</h2>
 
     <ul>
-      <li>Back out contentious changes first, then argue your
-	case.</li>
+      <li>If contested, back out your 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,