svn commit: r46994 - head/en_US.ISO8859-1/htdocs/internal

[Matthew Seaman]

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>