bjori Sun Sep 2 16:15:41 2007 UTC
Modified files:
/phpdoc/RFC manual.xml.in
Log:
Sync with /manual.xml.in
http://cvs.php.net/viewvc.cgi/phpdoc/RFC/manual.xml.in?r1=1.21&r2=1.22&diff_format=u
Index: phpdoc/RFC/manual.xml.in
diff -u phpdoc/RFC/manual.xml.in:1.21 phpdoc/RFC/manual.xml.in:1.22
--- phpdoc/RFC/manual.xml.in:1.21 Sun Sep 2 16:07:43 2007
+++ phpdoc/RFC/manual.xml.in Sun Sep 2 16:15:41 2007
@@ -1,8 +1,17 @@
<?xml version='1.0' encoding='@ENCODING@' ?>
-<!DOCTYPE book PUBLIC "-//PHPDocGroup//DTD DocBook XML V4.1.2-Based Variant
PHPBook V1.1//EN"
- "@srcdir@/dtds/phpbook.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
+"@srcdir@/docbook/docbook-xml/docbook.dtd" [
-<!-- $Revision: 1.21 $ --> <!-- Last updated to comply to manual.xml.in 1.189
-->
+<!-- $Revision: 1.22 $ --> <!-- Last updated to comply to manual.xml.in 1.189
-->
+<!-- We use xhtml entities all over the place -->
+<!ENTITY % xhtml-lat1 SYSTEM "@srcdir@/entities/ISO/xhtml1-lat1.ent">
+<!ENTITY % xhtml-symbol SYSTEM "@srcdir@/entities/ISO/xhtml1-symbol.ent">
+<!ENTITY % xhtml-special SYSTEM "@srcdir@/entities/ISO/xhtml1-special.ent">
+<!ENTITY % isopub SYSTEM "@srcdir@/entities/ISO/isopub.ent">
+%xhtml-lat1;
+%xhtml-symbol;
+%xhtml-special;
+%isopub;
<!-- Add translated specific definitions and snippets -->
<!ENTITY % language-defs SYSTEM "@srcdir@/@LANGDIR@/language-defs.ent">
@@ -45,19 +54,19 @@
<!ENTITY missing-ids SYSTEM "entities/missing-ids.xml">
]>
-<book id="manual" lang="@LANG@">
+<book xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="manual"
xml:lang="@LANG@" xmlns:xlink="http://www.w3.org/1999/xlink";>
<title>&PHPManual;</title>
&bookinfo;
&preface;
- <part id="getting-started">
+ <part xml:id="getting-started">
<title>&GettingStarted;</title>
&chapters.intro;
&chapters.tutorial;
</part>
- <part id="install">
+ <part xml:id="install">
<title>&InstallAndConfigure;</title>
&install.intro;
&install.unix.index;
@@ -68,7 +77,7 @@
&install.ini;
</part>
- <part id="langref">
+ <part xml:id="langref">
<title>&LanguageReference;</title>
&language.basic-syntax;
&language.types;
@@ -80,10 +89,11 @@
&language.functions;
&language.oop;
&language.oop5;
+ &language.exceptions;
&language.references;
</part>
- <part id="security">
+ <part xml:id="security">
<title>&Security;</title>
&security.intro;
&security.general;
@@ -94,11 +104,12 @@
&security.errors;
&security.globals;
&security.variables;
+ &security.magicquotes;
&security.hiding;
&security.current;
</part>
- <part id="features">
+ <part xml:id="features">
<title>&Features;</title>
&features.http-auth;
&features.cookies;
@@ -112,13 +123,13 @@
&features.commandline;
</part>
- <part id="funcref">
+ <part xml:id="funcref">
<title>&FunctionReference;</title>
- <refgroup id="refs.basic">
+ <refgroup xml:id="refs.basic">
<title>Basic PHP Extensions</title>
- <refgroup id="refs.basic.vartype">
+ <refgroup xml:id="refs.basic.vartype">
<title>Variable and Type Related Extensions</title>
&reference.array.reference;
&reference.classobj.reference;
@@ -129,7 +140,7 @@
&reference.var.reference;
</refgroup>
- <refgroup id="refs.basic.text">
+ <refgroup xml:id="refs.basic.text">
<title>Text Processing</title>
&reference.strings.reference;
&reference.regex.reference;
@@ -137,7 +148,7 @@
&reference.bbcode.reference;
</refgroup>
- <refgroup id="refs.basic.php">
+ <refgroup xml:id="refs.basic.php">
<title>Affecting PHP's Behaviour</title>
&reference.apc.reference;
&reference.apd.reference;
@@ -149,7 +160,7 @@
&reference.runkit.reference;
</refgroup>
- <refgroup id="refs.basic.session">
+ <refgroup xml:id="refs.basic.session">
<title>Session Extensions</title>
&reference.msession.reference;
&reference.muscat.reference;
@@ -157,7 +168,7 @@
&reference.session-pgsql.reference;
</refgroup>
- <refgroup id="refs.basic.other">
+ <refgroup xml:id="refs.basic.other">
<title>Other Basic Extensions</title>
&reference.geoip.reference;
&reference.json.reference;
@@ -172,10 +183,10 @@
</refgroup>
- <refgroup id="refs.database">
+ <refgroup xml:id="refs.database">
<title>Database Extensions</title>
- <refgroup id="refs.database.abstract">
+ <refgroup xml:id="refs.database.abstract">
<title>Abstraction Layers</title>
&reference.dba.reference;
&reference.dbx.reference;
@@ -185,7 +196,7 @@
&reference.uodbc.reference;
</refgroup>
- <refgroup id="ref.database.abstract.pdo">
+ <refgroup xml:id="ref.database.abstract.pdo">
<title>PDO drivers</title>
&reference.pdo_dblib.reference;
&reference.pdo_firebird.reference;
@@ -198,7 +209,7 @@
&reference.pdo_sqlite.reference;
</refgroup>
- <refgroup id="refs.database.vendors">
+ <refgroup xml:id="refs.database.vendors">
<title>Vendor Specific Database Extensions</title>
&reference.dbase.reference;
&reference.dbm.reference;
@@ -226,7 +237,7 @@
</refgroup>
- <refgroup id="refs.xml">
+ <refgroup xml:id="refs.xml">
<title>XML Manipulation</title>
&reference.dom.reference;
&reference.domxml.reference;
@@ -242,13 +253,13 @@
&reference.xslt.reference;
</refgroup>
- <refgroup id="refs.webservice">
+ <refgroup xml:id="refs.webservice">
<title>Web Services</title>
&reference.soap.reference;
&reference.xmlrpc.reference;
</refgroup>
- <refgroup id="refs.creditcard">
+ <refgroup xml:id="refs.creditcard">
<title>Credit Card Processing</title>
&reference.ccvs.reference;
&reference.cybercash.reference;
@@ -257,10 +268,10 @@
&reference.mcve.reference;
</refgroup>
- <refgroup id="refs.mathcrypto">
+ <refgroup xml:id="refs.mathcrypto">
<title>Math and Cryptography</title>
- <refgroup id="refs.mathcrypto.math">
+ <refgroup xml:id="refs.mathcrypto.math">
<title>Mathematical Extensions</title>
&reference.bc.reference;
&reference.gmp.reference;
@@ -268,7 +279,7 @@
&reference.stats.reference;
</refgroup>
- <refgroup id="refs.mathcrypto.crypto">
+ <refgroup xml:id="refs.mathcrypto.crypto">
<title>Cryptography Extensions</title>
&reference.crack.reference;
&reference.mcrypt.reference;
@@ -276,7 +287,7 @@
</refgroup>
</refgroup>
- <refgroup id="refs.international">
+ <refgroup xml:id="refs.international">
<title>Human Language and Character Encoding Support</title>
&reference.enchant.reference;
&reference.fribidi.reference;
@@ -290,10 +301,10 @@
&reference.unicode.reference;
</refgroup>
- <refgroup id="refs.fileprocess">
+ <refgroup xml:id="refs.fileprocess">
<title>File System and Process Control</title>
- <refgroup id="refs.fileprocess.file">
+ <refgroup xml:id="refs.fileprocess.file">
<title>File System Related Extensions</title>
&reference.dio.reference;
&reference.dir.reference;
@@ -304,7 +315,7 @@
&reference.xdiff.reference;
</refgroup>
- <refgroup id="refs.fileprocess.process">
+ <refgroup xml:id="refs.fileprocess.process">
<title>Process Control Extensions</title>
&reference.expect.reference;
&reference.posix.reference;
@@ -315,10 +326,10 @@
</refgroup>
</refgroup>
- <refgroup id="refs.remote">
+ <refgroup xml:id="refs.remote">
<title>Accessing Services</title>
- <refgroup id="refs.remote.mail">
+ <refgroup xml:id="refs.remote.mail">
<title>Mail Related Extensions</title>
&reference.cyrus.reference;
&reference.mail.reference;
@@ -327,14 +338,13 @@
&reference.vpopmail.reference;
</refgroup>
- <refgroup id="refs.remote.auth">
+ <refgroup xml:id="refs.remote.auth">
<title>Authentication Services</title>
&reference.radius.reference;
&reference.kadm5.reference;
- </title>
</refgroup>
- <refgroup id="refs.remote.other">
+ <refgroup xml:id="refs.remote.other">
<title>Other Services</title>
&reference.curl.reference;
&reference.fam.reference;
@@ -361,7 +371,7 @@
</refgroup>
</refgroup>
- <refgroup id="refs.compression">
+ <refgroup xml:id="refs.compression">
<title>Compression Extensions</title>
&reference.bzip2.reference;
&reference.lzf.reference;
@@ -371,17 +381,17 @@
&reference.zlib.reference;
</refgroup>
- <refgroup id="refs.calendar">
+ <refgroup xml:id="refs.calendar">
<title>Calendar and Event Related Extensions</title>
&reference.calendar.reference;
&reference.datetime.reference;
&reference.mcal.reference;
</refgroup>
- <refgroup id="refs.utilspec">
+ <refgroup xml:id="refs.utilspec">
<title>Utilization Area Specific Extensions</title>
- <refgroup id="refs.utilspec.nontext">
+ <refgroup xml:id="refs.utilspec.nontext">
<title>Non-Text MIME Output</title>
&reference.cpdf.reference;
&reference.fdf.reference;
@@ -394,28 +404,28 @@
&reference.swish.reference;
</refgroup>
- <refgroup id="refs.utilspec.image">
+ <refgroup xml:id="refs.utilspec.image">
<title>Image Processing and Generation</title>
&reference.exif.reference;
&reference.image.reference;
&reference.imagick.reference;
</refgroup>
- <refgroup id="refs.utilspec.audio">
+ <refgroup xml:id="refs.utilspec.audio">
<title>Audio Formats Manipulation</title>
&reference.id3.reference;
&reference.oggvorbis.reference;
&reference.openal.reference;
</refgroup>
- <refgroup id="refs.utilspec.cmdline">
+ <refgroup xml:id="refs.utilspec.cmdline">
<title>Command Line Specific Extensions</title>
&reference.newt.reference;
&reference.ncurses.reference;
&reference.readline.reference;
</refgroup>
- <refgroup id="refs.utilspec.windows">
+ <refgroup xml:id="refs.utilspec.windows">
<title>Windows Only Extensions</title>
&reference.dotnet.reference;
&reference.com.reference;
@@ -425,28 +435,42 @@
&reference.printer.reference;
</refgroup>
- <refgroup id="refs.utilspec.server">
+ <refgroup xml:id="refs.utilspec.server">
<title>Server Specific Extensions</title>
&reference.apache.reference;
&reference.nsapi.reference;
<!-- &reference.iisfunc.reference; -->
</refgroup>
- <refgroup id="refs.utilspec.misc">
+ <refgroup xml:id="refs.utilspec.misc">
<title>Misc Extensions</title>
&reference.satellite.reference;
</refgroup>
</refgroup>
</part>
- &zendapi.toc;
- <part id="api">
- <title>&api;</title>
- <titleabbrev>&apiabbrev;</titleabbrev>
- &chapters.streams;
+ @INTERNALS_EXCL_BEGIN@
+ <part xml:id="internals2">
+ <title>&Internals2;</title>
+ &internals2.intro;
+ &internals2.buildsys.index;
+ &internals2.structure.index;
+ &internals2.memory.index;
+ &internals2.variables.index;
+ &internals2.funcs.index;
+ &internals2.objects.index;
+ &internals2.resources.index;
+ &internals2.ini.index;
+ &internals2.streams.index;
+ &internals2.pdo.index;
+ &internals2.faq.index;
+ &internals2.apiref.index;
+ &internals2.ze1.index;
+ &internals2.ze3.index;
</part>
+ @INTERNALS_EXCL_END@
- <part id="faq">
+ <part xml:id="faq">
<title>&FAQ;</title>
<titleabbrev>&FAQabbrev;</titleabbrev>
&faq.general;
@@ -465,16 +489,19 @@
&faq.misc;
</part>
- <part id="appendices">
+ <part xml:id="appendices">
<title>&Appendices;</title>
&appendices.history;
+ &appendices.migration52;
+ &appendices.migration51;
&appendices.migration5;
&appendices.migration4;
&appendices.migration;
&appendices.debugger;
- &appendices.phpdevel;
&appendices.configure.index;
&appendices.ini;
+ &appendices.timezones;
+ &appendices.extensions;
&appendices.aliases;
&appendices.reserved;
&appendices.resources;
@@ -483,6 +510,7 @@
&appendices.transports;
&appendices.comparisons;
&appendices.tokens;
+ &appendices.userlandnaming;
&appendices.about;
&appendices.license;
&global.function-index;
@@ -490,7 +518,7 @@
</part>
@CHMONLY_INCL_BEGIN@
- <part id="chmonly">
+ <part xml:id="chmonly">
<title>&CHMEdition;</title>
&chmonly.aboutchm;
&chmonly.usingchm;
