From owner-svn-doc-head@freebsd.org  Thu Jul 16 06:42:32 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 CADBD9A3179;
 Thu, 16 Jul 2015 06:42:32 +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 BAF91197D;
 Thu, 16 Jul 2015 06:42:32 +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 t6G6gWAi031387;
 Thu, 16 Jul 2015 06:42:32 GMT (envelope-from matthew@FreeBSD.org)
Received: (from matthew@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6G6gWtE031386;
 Thu, 16 Jul 2015 06:42:32 GMT (envelope-from matthew@FreeBSD.org)
Message-Id: <201507160642.t6G6gWtE031386@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 06:42:32 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r46994 - 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 06:42:32 -0000

Author: matthew (ports committer)
Date: Thu Jul 16 06:42:31 2015
New Revision: 46994
URL: https://svnweb.freebsd.org/changeset/doc/46994

Log:
  Adopt 'strives to be a meritocracy' wording
  
  With hat:	core-secretary
  Submitted by:	jonathan, cperciva, koobs, others
  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 04:02:24 2015	(r46993)
+++ head/en_US.ISO8859-1/htdocs/internal/code-of-conduct.xml	Thu Jul 16 06:42:31 2015	(r46994)
@@ -81,12 +81,12 @@
       <li>Incitement to or condoning of any of these.</li>
     </ul>
 
-    <p>&os; is a meritocracy.  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 from,
-      what they look like, what gender they identify as, who they
-      choose to sleep with, how old they are, their physical
+    <p>&os; strives to be a meritocracy.  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
+      from, what they look like, what gender they identify as, who
+      they choose to sleep with, how old they are, their physical
       capabilities or what sort of religious beliefs they may hold.
       What matters is the contribution they are able to make to the
       project, and only that.</p>