From zeta-commits-return-226-apmail-incubator-zeta-commits-archive=incubator.apache.org@incubator.apache.org Sat Nov 06 13:15:19 2010 Return-Path: Delivered-To: apmail-incubator-zeta-commits-archive@minotaur.apache.org Received: (qmail 61590 invoked from network); 6 Nov 2010 13:15:19 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Nov 2010 13:15:19 -0000 Received: (qmail 13255 invoked by uid 500); 6 Nov 2010 13:15:50 -0000 Delivered-To: apmail-incubator-zeta-commits-archive@incubator.apache.org Received: (qmail 13229 invoked by uid 500); 6 Nov 2010 13:15:49 -0000 Mailing-List: contact zeta-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: zeta-dev@incubator.apache.org Delivered-To: mailing list zeta-commits@incubator.apache.org Received: (qmail 13222 invoked by uid 99); 6 Nov 2010 13:15:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Nov 2010 13:15:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sat, 06 Nov 2010 13:15:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 174D7238890D; Sat, 6 Nov 2010 13:14:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Date: Sat, 06 Nov 2010 13:14:35 -0000 To: zeta-commits@incubator.apache.org From: toby@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101106131435.174D7238890D@eris.apache.org> Subject: [zeta-commits] svn commit: r1032044 - /incubator/zetacomponents/website/content/community/implementation.txt Author: toby Date: Sat Nov 6 13:14:34 2010 New Revision: 1032044 URL: http://svn.apache.org/viewvc?rev=1032044&view=rev Log: - Fixed: Implementation guidelines regarding ASF procedures. Modified: incubator/zetacomponents/website/content/community/implementation.txt Modified: incubator/zetacomponents/website/content/community/implementation.txt URL: http://svn.apache.org/viewvc/incubator/zetacomponents/website/content/community/implementation.txt?rev=1032044&r1=1032043&r2=1032044&view=diff ============================================================================== --- incubator/zetacomponents/website/content/community/implementation.txt (original) +++ incubator/zetacomponents/website/content/community/implementation.txt Sat Nov 6 13:14:34 2010 @@ -967,10 +967,26 @@ The option class itself, could look like /** * File containing the ezcFooBar class * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * * @package Mail * @version //autogen// - * @copyright Copyright (C) 2005-2007 eZ systems as. All rights reserved. - * @license http://ez.no/licenses/new_bsd New BSD License + * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 */ /** @@ -1188,15 +1204,16 @@ In general the examples show in what ord File documentation ------------------ -Required in all source files with and without a class. PHPDocumentor will -show a warning message otherwise. + +Required in all source files with and without a class. PHPDocumentor will show +a warning message otherwise. In addition, the license information must be +available in **all files**. The following fields are required: - A short (one line) description of the file. - @version - @package -- @copyright - @license The following fields are optional: @@ -1206,16 +1223,35 @@ The following fields are optional: - @subpackage Tests To be used for files/classes that make out a part of the test suite. +The following fields may not occur: + +- @copyright Example: :: /** * Short description of the contents of the file. * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * * @version //autogen// * @package PackageName - * @copyright Copyright (C) 2005-2007 eZ systems as. All rights reserved. - * @license http://ez.no/licenses/new_bsd New BSD License + * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 */ Class documentation @@ -1295,10 +1331,11 @@ Exception class documentation follows th /** * File containing the class * + * [… license …] + * * @package * @version //autogentag// - * @copyright Copyright (C) 2005-2007 eZ systems as. All rights reserved. - * @license http://ez.no/licenses/new_bsd New BSD License + * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 */ /** * Exception for . @@ -1589,8 +1626,8 @@ phpDocumentor tags and required usage @license Required for the documentation of all files. It should always read:: - - @license http://ez.no/licenses/new_bsd New BSD License + + @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 @link Required when linking in the documentation.