bjori Sat Jun 30 14:14:03 2007 UTC
Modified files:
/phpdoc/en/features xforms.xml
/phpdoc/en/reference/dom reference.xml
/phpdoc/en/reference/dom/functions dom-domnode-removechild.xml
/phpdoc/en/reference/msql/functions msql-query.xml
/phpdoc/en/reference/pdo reference.xml
/phpdoc/en/reference/pgsql/functions pg-query.xml
/phpdoc/en/reference/simplexml/functions
simplexml-element-getDocNamespaces.xml
simplexml-element-getNamespaces.xml
simplexml-element-registerXPathNamespace.xml
/phpdoc/en/reference/strings/functions sscanf.xml
Log:
Revert bogus s/id/xml:id in examples caused by the docbook5 upgrade
http://cvs.php.net/viewvc.cgi/phpdoc/en/features/xforms.xml?r1=1.4&r2=1.5&diff_format=u
Index: phpdoc/en/features/xforms.xml
diff -u phpdoc/en/features/xforms.xml:1.4 phpdoc/en/features/xforms.xml:1.5
--- phpdoc/en/features/xforms.xml:1.4 Wed Jun 20 22:24:11 2007
+++ phpdoc/en/features/xforms.xml Sat Jun 30 14:14:03 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<chapter xml:id="features.xforms" xmlns="http://docbook.org/ns/docbook";
xmlns:xlink="http://www.w3.org/1999/xlink";>
<title>Dealing with XForms</title>
<para>
@@ -23,7 +23,7 @@
<h:title>Search</h:title>
<model>
<submission action="http://example.com/search";
- method="post" xml:id="s"/>
+ method="post" id="s"/>
</model>
</h:head>
<h:body>
@@ -70,7 +70,7 @@
<h:title>Search</h:title>
<model>
<submission action="http://example.com/search";
- method="urlencoded-post" xml:id="s"/>
+ method="urlencoded-post" id="s"/>
</model>
</h:head>
<h:body>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/dom/reference.xml?r1=1.29&r2=1.30&diff_format=u
Index: phpdoc/en/reference/dom/reference.xml
diff -u phpdoc/en/reference/dom/reference.xml:1.29
phpdoc/en/reference/dom/reference.xml:1.30
--- phpdoc/en/reference/dom/reference.xml:1.29 Wed Jun 20 22:24:21 2007
+++ phpdoc/en/reference/dom/reference.xml Sat Jun 30 14:14:03 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.29 $ -->
+<!-- $Revision: 1.30 $ -->
<!-- Purpose: xml -->
<!-- Membership: bundled, external -->
@@ -1320,9 +1320,9 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
]>
-<book xml:id="listing">
+<book id="listing">
<title>My lists</title>
- <chapter xml:id="books">
+ <chapter id="books">
<title>My books</title>
<para>
<informaltable>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/dom/functions/dom-domnode-removechild.xml?r1=1.11&r2=1.12&diff_format=u
Index: phpdoc/en/reference/dom/functions/dom-domnode-removechild.xml
diff -u phpdoc/en/reference/dom/functions/dom-domnode-removechild.xml:1.11
phpdoc/en/reference/dom/functions/dom-domnode-removechild.xml:1.12
--- phpdoc/en/reference/dom/functions/dom-domnode-removechild.xml:1.11 Wed Jun
20 22:24:22 2007
+++ phpdoc/en/reference/dom/functions/dom-domnode-removechild.xml Sat Jun
30 14:14:03 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
<refentry xml:id='function.dom-domnode-removechild'
xmlns="http://docbook.org/ns/docbook";>
<refnamediv>
<refname>DOMNode->removeChild()</refname>
@@ -92,7 +92,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";>
-<book xml:id="listing">
+<book id="listing">
<title>My lists</title>
</book>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/msql/functions/msql-query.xml?r1=1.8&r2=1.9&diff_format=u
Index: phpdoc/en/reference/msql/functions/msql-query.xml
diff -u phpdoc/en/reference/msql/functions/msql-query.xml:1.8
phpdoc/en/reference/msql/functions/msql-query.xml:1.9
--- phpdoc/en/reference/msql/functions/msql-query.xml:1.8 Wed Jun 20
22:24:59 2007
+++ phpdoc/en/reference/msql/functions/msql-query.xml Sat Jun 30 14:14:03 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<refentry xml:id="function.msql-query" xmlns="http://docbook.org/ns/docbook";>
<refnamediv>
<refname>msql_query</refname>
@@ -54,7 +54,7 @@
msql_select_db("db", $link)
or die("unable to select database 'db': " . msql_error());
-$result = msql_query("SELECT * FROM table WHERE xml:id=1", $link);
+$result = msql_query("SELECT * FROM table WHERE id=1", $link);
if (!$result) {
die("query failed: " . msql_error());
}
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo/reference.xml?r1=1.57&r2=1.58&diff_format=u
Index: phpdoc/en/reference/pdo/reference.xml
diff -u phpdoc/en/reference/pdo/reference.xml:1.57
phpdoc/en/reference/pdo/reference.xml:1.58
--- phpdoc/en/reference/pdo/reference.xml:1.57 Wed Jun 20 22:25:12 2007
+++ phpdoc/en/reference/pdo/reference.xml Sat Jun 30 14:14:03 2007
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.57 $ -->
+<!-- $Revision: 1.58 $ -->
<!-- Purpose: database.abstract -->
<!-- Membership: pecl, bundled -->
@@ -600,7 +600,7 @@
<![CDATA[
<?php
$db = new PDO('odbc:SAMPLE', 'db2inst1', 'ibmdb2');
-$stmt = $db->prepare("select contenttype, imagedata from images where
xml:id=?");
+$stmt = $db->prepare("select contenttype, imagedata from images where id=?");
$stmt->execute(array($_GET['id']));
$stmt->bindColumn(1, $type, PDO::PARAM_STR, 256);
$stmt->bindColumn(2, $lob, PDO::PARAM_LOB);
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pgsql/functions/pg-query.xml?r1=1.14&r2=1.15&diff_format=u
Index: phpdoc/en/reference/pgsql/functions/pg-query.xml
diff -u phpdoc/en/reference/pgsql/functions/pg-query.xml:1.14
phpdoc/en/reference/pgsql/functions/pg-query.xml:1.15
--- phpdoc/en/reference/pgsql/functions/pg-query.xml:1.14 Wed Jun 20
22:25:14 2007
+++ phpdoc/en/reference/pgsql/functions/pg-query.xml Sat Jun 30 14:14:03 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
<!-- splitted from ./en/functions/pgsql.xml, last change in rev 1.2 -->
<refentry xml:id="function.pg-query" xmlns="http://docbook.org/ns/docbook";>
<refnamediv>
@@ -123,9 +123,9 @@
// these statements will be executed as one transaction
-$query = "UPDATE authors SET author=UPPER(author) WHERE xml:id=1;";
-$query .= "UPDATE authors SET author=LOWER(author) WHERE xml:id=2;";
-$query .= "UPDATE authors SET author=NULL WHERE xml:id=3;";
+$query = "UPDATE authors SET author=UPPER(author) WHERE id=1;";
+$query .= "UPDATE authors SET author=LOWER(author) WHERE id=2;";
+$query .= "UPDATE authors SET author=NULL WHERE id=3;";
pg_query($conn, $query);
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/simplexml/functions/simplexml-element-getDocNamespaces.xml?r1=1.8&r2=1.9&diff_format=u
Index:
phpdoc/en/reference/simplexml/functions/simplexml-element-getDocNamespaces.xml
diff -u
phpdoc/en/reference/simplexml/functions/simplexml-element-getDocNamespaces.xml:1.8
phpdoc/en/reference/simplexml/functions/simplexml-element-getDocNamespaces.xml:1.9
---
phpdoc/en/reference/simplexml/functions/simplexml-element-getDocNamespaces.xml:1.8
Wed Jun 20 22:25:24 2007
+++
phpdoc/en/reference/simplexml/functions/simplexml-element-getDocNamespaces.xml
Sat Jun 30 14:14:03 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<refentry xml:id='function.simplexml-element-getDocNamespaces'
xmlns="http://docbook.org/ns/docbook";>
<refnamediv>
<refname>SimpleXMLElement->getDocNamespaces()</refname>
@@ -58,8 +58,8 @@
$xml = <<<XML
<?xml version="1.0" standalone="yes"?>
<people xmlns:p="http://example.org/ns";>
- <p:person xml:id="1">John Doe</p:person>
- <p:person xml:id="2">Susie Q. Public</p:person>
+ <p:person id="1">John Doe</p:person>
+ <p:person id="2">Susie Q. Public</p:person>
</people>
XML;
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/simplexml/functions/simplexml-element-getNamespaces.xml?r1=1.9&r2=1.10&diff_format=u
Index:
phpdoc/en/reference/simplexml/functions/simplexml-element-getNamespaces.xml
diff -u
phpdoc/en/reference/simplexml/functions/simplexml-element-getNamespaces.xml:1.9
phpdoc/en/reference/simplexml/functions/simplexml-element-getNamespaces.xml:1.10
---
phpdoc/en/reference/simplexml/functions/simplexml-element-getNamespaces.xml:1.9
Wed Jun 20 22:25:24 2007
+++ phpdoc/en/reference/simplexml/functions/simplexml-element-getNamespaces.xml
Sat Jun 30 14:14:03 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<refentry xml:id='function.simplexml-element-getNamespaces'
xmlns="http://docbook.org/ns/docbook";>
<refnamediv>
<refname>SimpleXMLElement->getNamespaces()</refname>
@@ -58,8 +58,8 @@
$xml = <<<XML
<?xml version="1.0" standalone="yes"?>
<people xmlns:p="http://example.org/ns"; xmlns:t="http://example.org/test";>
- <p:person xml:id="1">John Doe</p:person>
- <p:person xml:id="2">Susie Q. Public</p:person>
+ <p:person id="1">John Doe</p:person>
+ <p:person id="2">Susie Q. Public</p:person>
</people>
XML;
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/simplexml/functions/simplexml-element-registerXPathNamespace.xml?r1=1.3&r2=1.4&diff_format=u
Index:
phpdoc/en/reference/simplexml/functions/simplexml-element-registerXPathNamespace.xml
diff -u
phpdoc/en/reference/simplexml/functions/simplexml-element-registerXPathNamespace.xml:1.3
phpdoc/en/reference/simplexml/functions/simplexml-element-registerXPathNamespace.xml:1.4
---
phpdoc/en/reference/simplexml/functions/simplexml-element-registerXPathNamespace.xml:1.3
Wed Jun 20 22:25:24 2007
+++
phpdoc/en/reference/simplexml/functions/simplexml-element-registerXPathNamespace.xml
Sat Jun 30 14:14:03 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<refentry xml:id='function.simplexml-element-registerXPathNamespace'
xmlns="http://docbook.org/ns/docbook";>
<refnamediv>
<refname>SimpleXMLElement->registerXPathNamespace()</refname>
@@ -73,14 +73,14 @@
$xml = <<<EOD
<book xmlns:chap="http://example.org/chapter-title";>
<title>My Book</title>
- <chapter xml:id="1">
+ <chapter id="1">
<chap:title>Chapter 1</chap:title>
<para>Donec velit. Nullam eget tellus vitae tortor gravida
scelerisque.
In orci lorem, cursus imperdiet, ultricies non, hendrerit et,
orci.
Nulla facilisi. Nullam velit nisl, laoreet id, condimentum ut,
ultricies id, mauris.</para>
</chapter>
- <chapter xml:id="2">
+ <chapter id="2">
<chap:title>Chapter 2</chap:title>
<para>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Proin
gravida. Phasellus tincidunt massa vel urna. Proin adipiscing quam
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/strings/functions/sscanf.xml?r1=1.15&r2=1.16&diff_format=u
Index: phpdoc/en/reference/strings/functions/sscanf.xml
diff -u phpdoc/en/reference/strings/functions/sscanf.xml:1.15
phpdoc/en/reference/strings/functions/sscanf.xml:1.16
--- phpdoc/en/reference/strings/functions/sscanf.xml:1.15 Wed Jun 20
22:25:29 2007
+++ phpdoc/en/reference/strings/functions/sscanf.xml Sat Jun 30 14:14:03 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
<!-- splitted from ./en/functions/strings.xml, last change in rev 1.33 -->
<refentry xmlns="http://docbook.org/ns/docbook"; xml:id="function.sscanf">
<refnamediv>
@@ -58,7 +58,7 @@
// get author info and generate DocBook entry
$auth = "24\tLewis Carroll";
$n = sscanf($auth, "%d\t%s %s", $id, $first, $last);
-echo "<author xml:id='$id'>
+echo "<author id='$id'>
<firstname>$first</firstname>
<surname>$last</surname>
</author>\n";
