cvs: phpdoc / LICENSE
| From: | Hannes Magnusson | Date: | Mon, 21 Jul 2008 21:11:30 +0000 |
| Subject: | cvs: phpdoc / LICENSE | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-1895@lists.php.net to get a copy of this message | ||
bjori Mon Jul 21 21:11:30 2008 UTC
Modified files:
/phpdoc LICENSE
Log:
Sync with the XML
http://cvs.php.net/viewvc.cgi/phpdoc/LICENSE?r1=1.10&r2=1.11&diff_format=u
Index: phpdoc/LICENSE
diff -u phpdoc/LICENSE:1.10 phpdoc/LICENSE:1.11
--- phpdoc/LICENSE:1.10 Tue Jan 1 13:42:56 2008
+++ phpdoc/LICENSE Mon Jul 21 21:11:29 2008
@@ -1,30 +1,21 @@
-Documentation content licensing:
-
- Copyright (c) 1997 - 2008 by the PHP Documentation Group. This
- material may be distributed only subject to the terms and
- conditions set forth in the Open Publication License, v1.0 or
- later. A copy of the Open Publication License is distributed
- with this manual, the latest version is presently available
- at http://www.opencontent.org/openpub/.
+Documentation content licensing:
- Distribution of substantively modified versions of this document
- is prohibited without the explicit permission of the copyright holder.
-
- Distribution of the work or derivative of the work in any
- standard (paper) book form is prohibited unless prior permission
- is obtained from the copyright holder.
-
- In case you are interested in redistribution or republishing of
- this document in whole or in part, either modified or unmodified,
- and you have questions, please contact the copyright holders at
- doc-license@lists.php.net. Note that this address is mapped to
- a publicly archived mailing list.
-
- The Chapter 46 section of the documentation is based on an
- initial contribution by Zend Technologies.
+ Copyright © 1997 - 2008 by the PHP Documentation Group. This material
+ may be distributed only subject to the terms and conditions set forth
+ in the Creative Commons Attribution 3.0 License or later. A copy of
+ the Creative Commons Attribution 3.0 license is distributed with this
+ manual. The latest version is presently available at »
+ http://creativecommons.org/licenses/by/3.0/.
+
+ If you are interested in redistribution or republishing of this
+ document in whole or in part, either modified or unmodified, and you
+ have questions, please contact the Copyright holders at »
+ doc-license@lists.php.net. Note that this address is mapped to a
+ publicly archived mailing list.
Documentation tools licensing:
Most of the custom scripts used to build the documentation are
under the PHP License. Please check the license headers in the
files for more details.
+