Date: Sat, 1 Aug 2015 09:28:09 +0000 (UTC) From: Matthew Seaman <matthew@FreeBSD.org> 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 Message-ID: <201508010928.t719S93n056574@repo.freebsd.org>
index | next in thread | raw e-mail
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 werehome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508010928.t719S93n056574>