From 4b12def6dbc63cda0c16423c954bbeda44977aa1 Mon Sep 17 00:00:00 2001
From: Matthew Seaman <matthew@FreeBSD.org>
Date: Tue, 14 Jul 2015 20:48:36 +0000
Subject: [PATCH] Improvements and fixes suggested by Warren Block.

With hat:	core-secretary
Submitted by:	wblock
Approved by:	core
---
 en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml b/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml
index 92e9b626ba..f26da5e349 100644
--- a/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml
+++ b/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml
@@ -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>