You are viewing a plain text version of this content. The canonical link for it is here.
Posted to zeta-commits@incubator.apache.org by to...@apache.org on 2010/11/06 13:14:35 UTC
[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 <exception name> class
      *
+     * [â¦ license â¦]
+     *
      * @package <packagename>
      * @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 <shortdesc>.
@@ -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.