bjori Sun Sep 2 17:11:04 2007 UTC
Modified files:
/phpdoc/RFC manual.xml.in
Log:
Replace refgroups with sets/books
http://cvs.php.net/viewvc.cgi/phpdoc/RFC/manual.xml.in?r1=1.22&r2=1.23&diff_format=u
Index: phpdoc/RFC/manual.xml.in
diff -u phpdoc/RFC/manual.xml.in:1.22 phpdoc/RFC/manual.xml.in:1.23
--- phpdoc/RFC/manual.xml.in:1.22 Sun Sep 2 16:15:41 2007
+++ phpdoc/RFC/manual.xml.in Sun Sep 2 17:11:03 2007
@@ -1,8 +1,8 @@
<?xml version='1.0' encoding='@ENCODING@' ?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
+<!DOCTYPE set PUBLIC "-//OASIS//DTD DocBook XML V5.0//EN"
"@srcdir@/docbook/docbook-xml/docbook.dtd" [
-<!-- $Revision: 1.22 $ --> <!-- Last updated to comply to manual.xml.in 1.189
-->
+<!-- $Revision: 1.23 $ --> <!-- 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">
@@ -54,19 +54,21 @@
<!ENTITY missing-ids SYSTEM "entities/missing-ids.xml">
]>
-<book xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="manual"
xml:lang="@LANG@" xmlns:xlink="http://www.w3.org/1999/xlink">
+<set xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="index"
xml:lang="@LANG@" xmlns:xlink="http://www.w3.org/1999/xlink">
+<book xml:id="manual">
<title>&PHPManual;</title>
&bookinfo;
&preface;
+</book>
- <part xml:id="getting-started">
+ <book xml:id="getting-started">
<title>&GettingStarted;</title>
&chapters.intro;
&chapters.tutorial;
- </part>
+ </book>
- <part xml:id="install">
+ <book xml:id="install">
<title>&InstallAndConfigure;</title>
&install.intro;
&install.unix.index;
@@ -75,9 +77,9 @@
&install.pecl;
&install.problems;
&install.ini;
- </part>
+ </book>
- <part xml:id="langref">
+ <book xml:id="langref">
<title>&LanguageReference;</title>
&language.basic-syntax;
&language.types;
@@ -91,9 +93,9 @@
&language.oop5;
&language.exceptions;
&language.references;
- </part>
+ </book>
- <part xml:id="security">
+ <book xml:id="security">
<title>&Security;</title>
&security.intro;
&security.general;
@@ -107,9 +109,9 @@
&security.magicquotes;
&security.hiding;
&security.current;
- </part>
+ </book>
- <part xml:id="features">
+ <book xml:id="features">
<title>&Features;</title>
&features.http-auth;
&features.cookies;
@@ -121,34 +123,35 @@
&features.persistent-connections;
&features.safe-mode;
&features.commandline;
- </part>
+ </book>
- <part xml:id="funcref">
+ <set xml:id="funcref">
<title>&FunctionReference;</title>
- <refgroup xml:id="refs.basic">
+ <set xml:id="refs.basic">
<title>Basic PHP Extensions</title>
- <refgroup xml:id="refs.basic.vartype">
+ <book xml:id="refs.basic.vartype">
<title>Variable and Type Related Extensions</title>
&reference.array.reference;
&reference.classobj.reference;
&reference.classkit.reference;
&reference.ctype.reference;
+ &reference.filter.reference;
&reference.funchand.reference;
&reference.objaggregation.reference;
&reference.var.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.basic.text">
+ <book xml:id="refs.basic.text">
<title>Text Processing</title>
&reference.strings.reference;
&reference.regex.reference;
&reference.pcre.reference;
&reference.bbcode.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.basic.php">
+ <book xml:id="refs.basic.php">
<title>Affecting PHP's Behaviour</title>
&reference.apc.reference;
&reference.apd.reference;
@@ -158,17 +161,17 @@
&reference.info.reference;
&reference.outcontrol.reference;
&reference.runkit.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.basic.session">
+ <book xml:id="refs.basic.session">
<title>Session Extensions</title>
&reference.msession.reference;
&reference.muscat.reference;
&reference.session.reference;
&reference.session-pgsql.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.basic.other">
+ <book xml:id="refs.basic.other">
<title>Other Basic Extensions</title>
&reference.geoip.reference;
&reference.json.reference;
@@ -179,14 +182,14 @@
&reference.stream.reference;
&reference.tidy.reference;
&reference.tokenizer.reference;
- </refgroup>
+ </book>
- </refgroup>
+ </set>
- <refgroup xml:id="refs.database">
+ <set xml:id="refs.database">
<title>Database Extensions</title>
- <refgroup xml:id="refs.database.abstract">
+ <book xml:id="refs.database.abstract">
<title>Abstraction Layers</title>
&reference.dba.reference;
&reference.dbx.reference;
@@ -194,22 +197,22 @@
&reference.sdo.reference;
&reference.sdodasrel.reference;
&reference.uodbc.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="ref.database.abstract.pdo">
+ <book xml:id="ref.database.abstract.pdo">
<title>PDO drivers</title>
- &reference.pdo_dblib.reference;
- &reference.pdo_firebird.reference;
- &reference.pdo_ibm.reference;
- &reference.pdo_informix.reference;
- &reference.pdo_mysql.reference;
- &reference.pdo_oci.reference;
- &reference.pdo_odbc.reference;
- &reference.pdo_pgsql.reference;
- &reference.pdo_sqlite.reference;
- </refgroup>
+ &reference.pdo-dblib.reference;
+ &reference.pdo-firebird.reference;
+ &reference.pdo-ibm.reference;
+ &reference.pdo-informix.reference;
+ &reference.pdo-mysql.reference;
+ &reference.pdo-oci.reference;
+ &reference.pdo-odbc.reference;
+ &reference.pdo-pgsql.reference;
+ &reference.pdo-sqlite.reference;
+ </book>
- <refgroup xml:id="refs.database.vendors">
+ <book xml:id="refs.database.vendors">
<title>Vendor Specific Database Extensions</title>
&reference.dbase.reference;
&reference.dbm.reference;
@@ -233,16 +236,17 @@
&reference.sesam.reference;
&reference.sqlite.reference;
&reference.sybase.reference;
- </refgroup>
+ </book>
- </refgroup>
+ </set>
- <refgroup xml:id="refs.xml">
+ <book xml:id="refs.xml">
<title>XML Manipulation</title>
&reference.dom.reference;
&reference.domxml.reference;
&reference.libxml.reference;
&reference.qtdom.reference;
+ &reference.sca.reference;
&reference.sdo-das-xml.reference;
&reference.simplexml.reference;
&reference.wddx.reference;
@@ -251,43 +255,45 @@
&reference.xmlwriter.reference;
&reference.xsl.reference;
&reference.xslt.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.webservice">
+ <book xml:id="refs.webservice">
<title>Web Services</title>
&reference.soap.reference;
&reference.xmlrpc.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.creditcard">
+ <book xml:id="refs.creditcard">
<title>Credit Card Processing</title>
&reference.ccvs.reference;
&reference.cybercash.reference;
&reference.cybermut.reference;
&reference.pfpro.reference;
&reference.mcve.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.mathcrypto">
+ <set xml:id="refs.mathcrypto">
<title>Math and Cryptography</title>
- <refgroup xml:id="refs.mathcrypto.math">
+ <book xml:id="refs.mathcrypto.math">
<title>Mathematical Extensions</title>
&reference.bc.reference;
&reference.gmp.reference;
&reference.math.reference;
&reference.stats.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.mathcrypto.crypto">
+ <book xml:id="refs.mathcrypto.crypto">
<title>Cryptography Extensions</title>
&reference.crack.reference;
+ &reference.hash.reference;
&reference.mcrypt.reference;
&reference.mhash.reference;
- </refgroup>
- </refgroup>
+ &reference.openssl.reference;
+ </book>
+ </set>
- <refgroup xml:id="refs.international">
+ <book xml:id="refs.international">
<title>Human Language and Character Encoding Support</title>
&reference.enchant.reference;
&reference.fribidi.reference;
@@ -299,12 +305,12 @@
&reference.aspell.reference;
&reference.pspell.reference;
&reference.unicode.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.fileprocess">
+ <set xml:id="refs.fileprocess">
<title>File System and Process Control</title>
- <refgroup xml:id="refs.fileprocess.file">
+ <book xml:id="refs.fileprocess.file">
<title>File System Related Extensions</title>
&reference.dio.reference;
&reference.dir.reference;
@@ -313,9 +319,9 @@
&reference.mime-magic.reference;
&reference.xattr.reference;
&reference.xdiff.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.fileprocess.process">
+ <book xml:id="refs.fileprocess.process">
<title>Process Control Extensions</title>
&reference.expect.reference;
&reference.posix.reference;
@@ -323,28 +329,28 @@
&reference.exec.reference;
&reference.sem.reference;
&reference.shmop.reference;
- </refgroup>
- </refgroup>
+ </book>
+ </set>
- <refgroup xml:id="refs.remote">
+ <set xml:id="refs.remote">
<title>Accessing Services</title>
- <refgroup xml:id="refs.remote.mail">
+ <book xml:id="refs.remote.mail">
<title>Mail Related Extensions</title>
&reference.cyrus.reference;
&reference.mail.reference;
&reference.mailparse.reference;
&reference.imap.reference;
&reference.vpopmail.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.remote.auth">
+ <book xml:id="refs.remote.auth">
<title>Authentication Services</title>
&reference.radius.reference;
&reference.kadm5.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.remote.other">
+ <book xml:id="refs.remote.other">
<title>Other Services</title>
&reference.curl.reference;
&reference.fam.reference;
@@ -360,7 +366,7 @@
&reference.mnogosearch.reference;
&reference.network.reference;
&reference.notes.reference;
- &reference.openssl.reference;
+ &reference.sam.reference;
&reference.sockets.reference;
&reference.ssh2.reference;
&reference.svn.reference;
@@ -368,10 +374,10 @@
&reference.yaz.reference;
&reference.nis.reference;
&reference.snmp.reference;
- </refgroup>
- </refgroup>
+ </book>
+ </set>
- <refgroup xml:id="refs.compression">
+ <book xml:id="refs.compression">
<title>Compression Extensions</title>
&reference.bzip2.reference;
&reference.lzf.reference;
@@ -379,19 +385,19 @@
&reference.rar.reference;
&reference.zip.reference;
&reference.zlib.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.calendar">
+ <book xml:id="refs.calendar">
<title>Calendar and Event Related Extensions</title>
&reference.calendar.reference;
&reference.datetime.reference;
&reference.mcal.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.utilspec">
+ <set xml:id="refs.utilspec">
<title>Utilization Area Specific Extensions</title>
- <refgroup xml:id="refs.utilspec.nontext">
+ <book xml:id="refs.utilspec.nontext">
<title>Non-Text MIME Output</title>
&reference.cpdf.reference;
&reference.fdf.reference;
@@ -399,33 +405,34 @@
&reference.haru.reference;
&reference.pdf.reference;
&reference.ming.reference;
+ &reference.ps.reference;
&reference.rpmreader.reference;
&reference.swf.reference;
&reference.swish.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.utilspec.image">
+ <book xml:id="refs.utilspec.image">
<title>Image Processing and Generation</title>
&reference.exif.reference;
&reference.image.reference;
&reference.imagick.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.utilspec.audio">
+ <book xml:id="refs.utilspec.audio">
<title>Audio Formats Manipulation</title>
&reference.id3.reference;
&reference.oggvorbis.reference;
&reference.openal.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.utilspec.cmdline">
+ <book xml:id="refs.utilspec.cmdline">
<title>Command Line Specific Extensions</title>
&reference.newt.reference;
&reference.ncurses.reference;
&reference.readline.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.utilspec.windows">
+ <book xml:id="refs.utilspec.windows">
<title>Windows Only Extensions</title>
&reference.dotnet.reference;
&reference.com.reference;
@@ -433,24 +440,24 @@
&reference.win32ps.reference;
&reference.win32service.reference;
&reference.printer.reference;
- </refgroup>
+ </book>
- <refgroup xml:id="refs.utilspec.server">
+ <book xml:id="refs.utilspec.server">
<title>Server Specific Extensions</title>
&reference.apache.reference;
&reference.nsapi.reference;
- <!-- &reference.iisfunc.reference; -->
- </refgroup>
+ &reference.iisfunc.reference;
+ </book>
- <refgroup xml:id="refs.utilspec.misc">
+ <book xml:id="refs.utilspec.misc">
<title>Misc Extensions</title>
&reference.satellite.reference;
- </refgroup>
- </refgroup>
- </part>
+ </book>
+ </set>
+ </set>
@INTERNALS_EXCL_BEGIN@
- <part xml:id="internals2">
+ <book xml:id="internals2">
<title>&Internals2;</title>
&internals2.intro;
&internals2.buildsys.index;
@@ -467,10 +474,10 @@
&internals2.apiref.index;
&internals2.ze1.index;
&internals2.ze3.index;
- </part>
+ </book>
@INTERNALS_EXCL_END@
- <part xml:id="faq">
+ <book xml:id="faq">
<title>&FAQ;</title>
<titleabbrev>&FAQabbrev;</titleabbrev>
&faq.general;
@@ -487,9 +494,9 @@
&faq.migration4;
&faq.migration5;
&faq.misc;
- </part>
+ </book>
- <part xml:id="appendices">
+ <book xml:id="appendices">
<title>&Appendices;</title>
&appendices.history;
&appendices.migration52;
@@ -501,7 +508,6 @@
&appendices.configure.index;
&appendices.ini;
&appendices.timezones;
- &appendices.extensions;
&appendices.aliases;
&appendices.reserved;
&appendices.resources;
@@ -515,10 +521,10 @@
&appendices.license;
&global.function-index;
&missing-ids;
- </part>
+ </book>
@CHMONLY_INCL_BEGIN@
- <part xml:id="chmonly">
+ <book xml:id="chmonly">
<title>&CHMEdition;</title>
&chmonly.aboutchm;
&chmonly.usingchm;
@@ -527,10 +533,10 @@
&chmonly.integration;
&chmonly.skins;
&chmonly.credits;
- </part>
+ </book>
@CHMONLY_INCL_END@
-</book>
+</set>
<!-- Keep this comment at the end of the file
Local variables:
@@ -548,4 +554,7 @@
sgml-local-catalogs:nil
sgml-local-ecat-files:nil
End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
-->