Return-Path: 
 <commits-return-1023-apmail-community-commits-archive=community.apache.org@community.apache.org>
X-Original-To: apmail-community-commits-archive@minotaur.apache.org
Delivered-To: apmail-community-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id E41D510790
	for <apmail-community-commits-archive@minotaur.apache.org>;
 Tue, 18 Nov 2014 20:32:50 +0000 (UTC)
Received: (qmail 70788 invoked by uid 500); 18 Nov 2014 20:32:50 -0000
Delivered-To: apmail-community-commits-archive@community.apache.org
Received: (qmail 70763 invoked by uid 500); 18 Nov 2014 20:32:50 -0000
Mailing-List: contact commits-help@community.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@community.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@community.apache.org>
List-Post: <mailto:commits@community.apache.org>
List-Id: <commits.community.apache.org>
Reply-To: dev@community.apache.org
Delivered-To: mailing list commits@community.apache.org
Received: (qmail 70753 invoked by uid 99); 18 Nov 2014 20:32:50 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Nov 2014 20:32:50 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Nov 2014 20:32:49 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id E7FD8238899C
	for <commits@community.apache.org>; Tue, 18 Nov 2014 20:32:28 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1640420 - /comdev/site/trunk/content/newbiefaq.mdtext
Date: Tue, 18 Nov 2014 20:32:28 -0000
To: commits@community.apache.org
From: rvesse@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20141118203228.E7FD8238899C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rvesse
Date: Tue Nov 18 20:32:28 2014
New Revision: 1640420

URL: http://svn.apache.org/r1640420
Log:
Point to new Code of Conduct document

Modified:
    comdev/site/trunk/content/newbiefaq.mdtext

Modified: comdev/site/trunk/content/newbiefaq.mdtext
URL: http://svn.apache.org/viewvc/comdev/site/trunk/content/newbiefaq.mdtext?rev=1640420&r1=1640419&r2=1640420&view=diff
==============================================================================
--- comdev/site/trunk/content/newbiefaq.mdtext (original)
+++ comdev/site/trunk/content/newbiefaq.mdtext Tue Nov 18 20:32:28 2014
@@ -170,12 +170,14 @@ started guide][1]. You will also find ou
 <a name="NewbieFAQ-IsthereaCodeofConductforApacheprojects?"></a>
 ## Is there a Code of Conduct for Apache projects?
 
-Here at Apache projects are free to define their own code of conduct.
-However, it is common for new projects to learn from the lessons of the
-older projects. The Apache Incubator project has a wiki page for collecting [common elements of Apache project Codes of Conduct](http://incubator.apache.org/guides/community.html)
-.
+Yes there is a code of conduct which may be found at 
+[http://www.apache.org/foundation/policies/conduct.html](http://www.apache.org/foundation/policies/conduct.html)
 
-The Incubator document has some really useful for both the newbie and the
+PMCs are allowed to define their own code of conduct for their individual communities
+but it is expected they also abide by the Foundation wide policy
+
+The [Incubator document](http://incubator.apache.org/guides/committer.html) also 
+has some really useful for both the newbie and the
 old hands (we all fall into bad habits occasionally). The section on ASF
 Mottos is especially useful as a reminder of the way things are in most ASF
 projects. This section includes such gems as: