From owner-svn-doc-all@freebsd.org  Sat Aug  1 09:28:09 2015
Return-Path: <owner-svn-doc-all@freebsd.org>
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 68D959AF907;
 Sat,  1 Aug 2015 09:28:09 +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 4F4761FD8;
 Sat,  1 Aug 2015 09:28:09 +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 t719S9Z3056575;
 Sat, 1 Aug 2015 09:28:09 GMT (envelope-from matthew@FreeBSD.org)
Received: (from matthew@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t719S93n056574;
 Sat, 1 Aug 2015 09:28:09 GMT (envelope-from matthew@FreeBSD.org)
Message-Id: <201508010928.t719S93n056574@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: Sat, 1 Aug 2015 09:28:09 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r47141 - 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 &quot;
 user&quot; , &quot; projects&quot; , and &quot; translations&quot;
 \)" <svn-doc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-all/>
List-Post: <mailto:svn-doc-all@freebsd.org>
List-Help: <mailto:svn-doc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-all>,
 <mailto:svn-doc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Aug 2015 09:28:09 -0000

Author: matthew (ports committer)
Date: Sat Aug  1 09:28:08 2015
New Revision: 47141
URL: https://svnweb.freebsd.org/changeset/doc/47141

Log:
  Remove mention of 'meritocracy'.  This is a term which incorporates
  several different meanings and it can be unclear which exactly we
  intend.  The paragraph is clear enough without it.
  
  Submitted by:	hps
  Approved by:	core (emaste, 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	Sat Aug  1 02:39:09 2015	(r47140)
+++ head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml	Sat Aug  1 09:28:08 2015	(r47141)
@@ -80,7 +80,7 @@
       <li>Incitement to or condoning of any of these.</li>
     </ul>
 
-    <p>&os; strives to be a meritocracy.  There can be no place
+    <p>There can be no place
       within the &os; Community for discriminatory speech or action.
       We do not believe anyone should be treated any differently based
       on who they are, where they are from, where their ancestors were