diff --git a/chapters.ent b/chapters.ent
deleted file mode 100644
index d51ba161cc..0000000000
--- a/chapters.ent
+++ /dev/null
@@ -1,112 +0,0 @@
-<!ENTITY preface                     SYSTEM "preface.xml">
-<!ENTITY bookinfo                    SYSTEM "bookinfo.xml">
-
-<!ENTITY chapter.copyright           SYSTEM "chapters/copyright.xml">
-<!ENTITY chapter.introduction        SYSTEM "chapters/intro.xml">
-<!ENTITY chapter.install             SYSTEM "chapters/install.xml">
-<!ENTITY chapter.config              SYSTEM "chapters/config.xml">
-<!ENTITY chapter.security            SYSTEM "chapters/security.xml">
-
-<!ENTITY features.http-auth          SYSTEM "features/http-auth.xml">
-<!ENTITY features.cookies            SYSTEM "features/cookies.xml">
-<!ENTITY features.file-upload        SYSTEM "features/file-upload.xml">
-<!ENTITY features.remote-files       SYSTEM "features/remote-files.xml">
-<!ENTITY features.connection-handling SYSTEM "features/connection-handling.xml">
-<!ENTITY features.error-handling     SYSTEM "features/error-handling.xml">
-<!ENTITY features.images             SYSTEM "features/images.xml">
-<!ENTITY features.persistent-connections SYSTEM "features/persistent-connections.xml">
-
-<!ENTITY language.basic-syntax       SYSTEM "language/basic-syntax.xml">
-<!ENTITY language.types              SYSTEM "language/types.xml">
-<!ENTITY language.variables          SYSTEM "language/variables.xml">
-<!ENTITY language.constants          SYSTEM "language/constants.xml">
-<!ENTITY language.expressions        SYSTEM "language/expressions.xml">
-<!ENTITY language.operators          SYSTEM "language/operators.xml">
-<!ENTITY language.functions          SYSTEM "language/functions.xml">
-<!ENTITY language.control-structures SYSTEM "language/control-structures.xml">
-<!ENTITY language.oop                SYSTEM "language/oop.xml">
-<!ENTITY language.references         SYSTEM "language/references.xml">
-
-<!ENTITY reference.apache            SYSTEM "functions/apache.xml">
-<!ENTITY reference.array             SYSTEM "functions/array.xml">
-<!ENTITY reference.aspell            SYSTEM "functions/aspell.xml">
-<!ENTITY reference.bc                SYSTEM "functions/bc.xml">
-<!ENTITY reference.calendar          SYSTEM "functions/calendar.xml">
-<!ENTITY reference.ccvs              SYSTEM "functions/ccvs.xml">
-<!ENTITY reference.classobj          SYSTEM "functions/classobj.xml">
-<!ENTITY reference.com               SYSTEM "functions/com.xml">
-<!ENTITY reference.cpdf              SYSTEM "functions/cpdf.xml">
-<!ENTITY reference.curl              SYSTEM "functions/curl.xml">
-<!ENTITY reference.cybercash         SYSTEM "functions/cybercash.xml">
-<!ENTITY reference.datetime          SYSTEM "functions/datetime.xml">
-<!ENTITY reference.dba               SYSTEM "functions/dba.xml">
-<!ENTITY reference.dbase             SYSTEM "functions/dbase.xml">
-<!ENTITY reference.dbm               SYSTEM "functions/dbm.xml">
-<!ENTITY reference.dir               SYSTEM "functions/dir.xml">
-<!-- ENTITY reference.dl                SYSTEM "functions/dl.xml" -->
-<!ENTITY reference.domxml            SYSTEM "functions/domxml.xml">
-<!ENTITY reference.errorfunc         SYSTEM "functions/errorfunc.xml">
-<!ENTITY reference.exec              SYSTEM "functions/exec.xml">
-<!ENTITY reference.fdf               SYSTEM "functions/fdf.xml">
-<!ENTITY reference.filepro           SYSTEM "functions/filepro.xml">
-<!ENTITY reference.filesystem        SYSTEM "functions/filesystem.xml">
-<!ENTITY reference.ftp               SYSTEM "functions/ftp.xml">
-<!ENTITY reference.funchand          SYSTEM "functions/funchand.xml">
-<!ENTITY reference.gettext           SYSTEM "functions/gettext.xml">
-<!ENTITY reference.gmp               SYSTEM "functions/gmp.xml">
-<!ENTITY reference.http              SYSTEM "functions/http.xml">
-<!ENTITY reference.hw                SYSTEM "functions/hw.xml">
-<!ENTITY reference.ibase             SYSTEM "functions/ibase.xml">
-<!ENTITY reference.icap              SYSTEM "functions/icap.xml">
-<!ENTITY reference.ifx               SYSTEM "functions/ifx.xml">
-<!ENTITY reference.image             SYSTEM "functions/image.xml">
-<!ENTITY reference.imap              SYSTEM "functions/imap.xml">
-<!ENTITY reference.info              SYSTEM "functions/info.xml">
-<!ENTITY reference.ingres_ii         SYSTEM "functions/ingres_ii.xml">
-<!ENTITY reference.ldap              SYSTEM "functions/ldap.xml">
-<!ENTITY reference.mail              SYSTEM "functions/mail.xml">
-<!ENTITY reference.math              SYSTEM "functions/math.xml">
-<!ENTITY reference.mcal              SYSTEM "functions/mcal.xml">
-<!ENTITY reference.mcrypt            SYSTEM "functions/mcrypt.xml">
-<!ENTITY reference.mhash             SYSTEM "functions/mhash.xml">
-<!ENTITY reference.misc              SYSTEM "functions/misc.xml">
-<!ENTITY reference.msql              SYSTEM "functions/msql.xml">
-<!ENTITY reference.mssql             SYSTEM "functions/mssql.xml">
-<!ENTITY reference.mysql             SYSTEM "functions/mysql.xml">
-<!ENTITY reference.network           SYSTEM "functions/network.xml">
-<!ENTITY reference.nis               SYSTEM "functions/nis.xml">
-<!ENTITY reference.oci8              SYSTEM "functions/oci8.xml">
-<!ENTITY reference.oracle            SYSTEM "functions/oracle.xml">
-<!ENTITY reference.outcontrol        SYSTEM "functions/outcontrol.xml">
-<!ENTITY reference.ovrimos           SYSTEM "functions/ovrimos.xml">
-<!ENTITY reference.pcre              SYSTEM "functions/pcre.xml">
-<!ENTITY reference.pdf               SYSTEM "functions/pdf.xml">
-<!ENTITY reference.pfpro             SYSTEM "functions/pfpro.xml">
-<!ENTITY reference.pgsql             SYSTEM "functions/pgsql.xml">
-<!ENTITY reference.posix             SYSTEM "functions/posix.xml">
-<!ENTITY reference.pspell            SYSTEM "functions/pspell.xml">
-<!ENTITY reference.readline          SYSTEM "functions/readline.xml">
-<!ENTITY reference.recode            SYSTEM "functions/recode.xml">
-<!ENTITY reference.regex             SYSTEM "functions/regex.xml">
-<!ENTITY reference.satellite         SYSTEM "functions/satellite.xml">
-<!ENTITY reference.sem               SYSTEM "functions/sem.xml">
-<!ENTITY reference.sesam             SYSTEM "functions/sesam.xml">
-<!ENTITY reference.session           SYSTEM "functions/session.xml">
-<!ENTITY reference.shmop             SYSTEM "functions/shmop.xml">
-<!ENTITY reference.snmp              SYSTEM "functions/snmp.xml">
-<!ENTITY reference.sockets           SYSTEM "functions/sockets.xml">
-<!ENTITY reference.strings           SYSTEM "functions/strings.xml">
-<!ENTITY reference.swf               SYSTEM "functions/swf.xml">
-<!ENTITY reference.sybase            SYSTEM "functions/sybase.xml">
-<!ENTITY reference.uodbc             SYSTEM "functions/uodbc.xml">
-<!ENTITY reference.url               SYSTEM "functions/url.xml">
-<!ENTITY reference.var               SYSTEM "functions/var.xml">
-<!ENTITY reference.wddx              SYSTEM "functions/wddx.xml">
-<!ENTITY reference.xml               SYSTEM "functions/xml.xml">
-<!ENTITY reference.xslt              SYSTEM "functions/xslt.xml">
-<!ENTITY reference.yaz               SYSTEM "functions/yaz.xml">
-<!ENTITY reference.zlib              SYSTEM "functions/zlib.xml">
-
-<!ENTITY appendix.migration          SYSTEM "appendices/migration.xml">
-<!ENTITY appendix.development        SYSTEM "appendices/phpdevel.xml">
-<!ENTITY appendix.debugger           SYSTEM "appendices/debugger.xml">
diff --git a/language-defs.ent b/language-defs.ent
new file mode 100644
index 0000000000..67e8f8b20d
--- /dev/null
+++ b/language-defs.ent
@@ -0,0 +1,10 @@
+<!ENTITY PHPManual		"PHP Manual">
+<!ENTITY Date			"Date:">
+<!ENTITY GettingStarted		"Getting Started">
+<!ENTITY LanguageReference	"Language Reference">
+<!ENTITY Features		"Features">
+<!ENTITY FunctionReference	"Function Reference">
+<!ENTITY Appendixes		"Appendixes">
+
+
+<!ENTITY available "available in">