From owner-svn-doc-head@freebsd.org  Thu Jul 16 20:08:28 2015
Return-Path: <owner-svn-doc-head@freebsd.org>
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 1FF9F9A4997;
 Thu, 16 Jul 2015 20:08:28 +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 0A13E1DFD;
 Thu, 16 Jul 2015 20:08:28 +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 t6GK8Rbp059565;
 Thu, 16 Jul 2015 20:08:27 GMT (envelope-from matthew@FreeBSD.org)
Received: (from matthew@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6GK8Rfm059564;
 Thu, 16 Jul 2015 20:08:27 GMT (envelope-from matthew@FreeBSD.org)
Message-Id: <201507162008.t6GK8Rfm059564@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: matthew set sender to
 matthew@FreeBSD.org using -f
From: Matthew Seaman <matthew@FreeBSD.org>
Date: Thu, 16 Jul 2015 20:08:27 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46998 - 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
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Jul 2015 20:08:28 -0000

Author: matthew (ports committer)
Date: Thu Jul 16 20:08:27 2015
New Revision: 46998
URL: https://svnweb.freebsd.org/changeset/doc/46998

Log:
  Improve wording.
  
  With hat:	core-secretary
  Submitted by:	jonathan
  Approved by:	core (gnn)

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	Thu Jul 16 19:01:25 2015	(r46997)
+++ head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml	Thu Jul 16 20:08:27 2015	(r46998)
@@ -48,8 +48,7 @@
       that what may seem to you to be a very mild statement can be
       deeply shocking to another.  Avoid contentious topics (unless
       directly technically relevant).  These things all have their
-      places, but not when they are out of context
-      here.</p>
+      places, but not here, where they are out of context.</p>
 
     <p>Try not to take offense where no offense was intended.  Not
       everyone speaks or writes English fluently.  Not everyone can