Merge branch 'php:master' into rv1

php · Dec 13, 2024 · bbf2491 · bbf2491
2 parents 8a0a334 + 0ef7804
commit bbf2491
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 6 deletions.
diff --git a/docbook/JING_LICENSE b/docbook/JING_LICENSE
@@ -0,0 +1,45 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Jing Copying Conditions</title>
+</head>
+
+<body>
+<h1>Jing Copying Conditions</h1>
+
+<p>Copyright (c) 2001-2003 Thai Open Source Software Center Ltd<br />
+All rights reserved.</p>
+
+<p>Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:</p>
+
+<ul>
+    <li>Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.</li>
+
+    <li>Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.</li>
+
+    <li>Neither the name of the Thai Open Source Software Center Ltd nor
+    the names of its contributors may be used to endorse or promote
+    products derived from this software without specific prior written
+    permission.</li>
+</ul>
+
+<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
+
+</body>
+
+</html>
diff --git a/entities/global.ent b/entities/global.ent
@@ -1,10 +1,13 @@
-<!-- -*- SGML -*-
+<!--
+    Temporary entities to avoid breaking translations.
+-->
+<!ENTITY reference.pdo-cubrid.entities.PDO "&reference.pdo-cubrid.entities.pdo-overloaded;">
+<!ENTITY reference.pdo-pgsql.entities.PDO "&reference.pdo-pgsql.entities.pdo-overloaded;">
+<!ENTITY reference.pdo-sqlite.entities.PDO "&reference.pdo-sqlite.entities.pdo-overloaded;">
 
- $Id$
-
- Contains global "macros" for all the XML documents.
-
- -->
+<!--
+    Contains global "macros" for all the XML documents.
+-->
 <!ENTITY url.7zip "http://www.7-zip.org/">
 <!ENTITY url.adabas "http://www.adabas.com/">
 <!ENTITY url.adobe.acrobat "http://www.adobe.com/products/acrobat/readstep2.html">