From: Norman Walsh <ndw@nwalsh.com>
Date: Tue, 19 Sep 2000 20:32:12 +0000 (+0000)
Subject: DocBook V4.1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=562f4ac4c0563b6e999b4d12e7542e238a4e5e04;p=docbook-dsssl

DocBook V4.1
---

diff --git a/docbook/sgml/40chg.txt b/docbook/sgml/40chg.txt
index b746977e7..2d2467d9e 100644
--- a/docbook/sgml/40chg.txt
+++ b/docbook/sgml/40chg.txt
@@ -1,6 +1,6 @@
-18 May 2000
+19 June 2000
 
-Changes from DocBook V3.1 to DocBook V4.0:
+Changes from DocBook V3.1 to DocBook V4.1:
 
 Markup:
 
@@ -29,6 +29,8 @@ Markup:
 - Added synopsis markup for modern programming languages (e.g, object
   oriented languages like Java, C++, and IDL)
 - Renamed DocInfo to PrefaceInfo, ChapterInfo, AppendixInfo, etc.
+- Comment was renamed Remark
+- InterfaceDefinition was removed
 
 Other:
 
diff --git a/docbook/sgml/41chg.txt b/docbook/sgml/41chg.txt
new file mode 100644
index 000000000..d2a914788
--- /dev/null
+++ b/docbook/sgml/41chg.txt
@@ -0,0 +1,7 @@
+19 June 2000
+
+Changes from DocBook V4.0 to DocBook V4.1:
+
+No user-visible changes; removed some 4.0 future use comments that had
+accidentally been left in the DTD and fixed a couple of incorrect FPIs.
+See 40chg.txt for a list of the significant changes.
diff --git a/docbook/sgml/50issues.txt b/docbook/sgml/50issues.txt
index 7418e9f40..31497420f 100644
--- a/docbook/sgml/50issues.txt
+++ b/docbook/sgml/50issues.txt
@@ -1,10 +1,10 @@
-18 January 2000
+19 June 2000
 
 Backwards-incompatible changes to DocBook that are planned for V5.0:
 
 - DocBook V5.0 will be an XML DTD. This will require a wide range of
   changes. As a result, DocBook V5.0 will more closely resemble
-  The XML version of DocBook V4.0 than the SGML version.
+  The XML version of DocBook V4.1 than the SGML version.
 
 - Parameter entity reorganization may greatly reduce many
   content models.  The goal of this effort is to remove a large
diff --git a/docbook/sgml/LostLog b/docbook/sgml/LostLog
index 0821e96e2..a95cdf17a 100644
--- a/docbook/sgml/LostLog
+++ b/docbook/sgml/LostLog
@@ -1,132 +1,88 @@
 This ChangeLog is all that remains from the previous incarnation of
 this CVS repository that was irretrievably lost.
 
-1999-02-01  Norman Walsh  <ndw@nwalsh.com>
+2000-06-19  Norman Walsh  <ndw@nwalsh.com>
 
-	* readme.txt: Updated readme, DocBook 3.1 released.
+	* 40chg.txt: Added notes about comment and interfacedefinition
 
-	* docbook.dtd, docbook.dcl, docbook.cat, dbnotn.mod, dbhier.mod, dbgenent.mod, dbcent.mod, dbpool.mod:
-	Updated version number
+	* 41chg.txt: New file.
 
-	* cals-tbl.dtd: For DocBook 3.1
+	* 50issues.txt, dbcent.mod, dbgenent.mod, dbhier.mod, dbnotn.mod, dbpool.mod, docbook.cat, docbook.dcl, readme.txt: 
+	Updated version numbers to 4.1
 
-	* 50issues.txt, 40issues.txt: Fixed date
+	* dbhier.mod, dbpool.mod: Removed 4.0 future use comments
 
-	* 31chg.txt: Changed date, updated owner identifier
+	* docbook.cat: Fixed version number in comment
 
-1999-01-31  Norman Walsh  <ndw@nwalsh.com>
+	* docbook.dtd: DocBook V4.1 released.
 
-	* dbpool.mod:
-	Added missing semicolons to several parameter entity references.
-	Changed Constant and VarName to be * not + since they contain #PCDATA.
+2000-05-18  Norman Walsh  <ndw@nwalsh.com>
 
-	* dbhier.mod: Added missing semicolon to a parameter entity reference
+	* 40chg.txt, dbcent.mod, dbgenent.mod, dbhier.mod, dbnotn.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd, readme.txt: 
+	Removed references to beta6
 
-1999-01-21  Norman Walsh  <ndw@nwalsh.com>
+	* docbook.dtd: DocBook V4.0 released.
 
-	* dbhier.mod: Added missing semicolon in PE invokation.
+2000-04-10  Norman Walsh  <ndw@nwalsh.com>
 
-1999-01-14  Norman Walsh  <ndw@nwalsh.com>
+	* 40chg.txt, dbcent.mod, dbgenent.mod, dbhier.mod, dbnotn.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd, readme.txt: 
+	Updated release date and version to 4.0beta6
 
-	* readme.txt: New file.
+	* dbpool.mod: Added support for EBNF hook; fixed equation content bug
 
-	* dbcent.mod, dbgenent.mod, dbhier.mod, dbnotn.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd:
-	BETA1 Release
+2000-04-03  Norman Walsh  <ndw@nwalsh.com>
 
-	* 50issues.txt: Added known changes.
+	* 40chg.txt: Added note about renaming DocInfo to *Info.
 
-	* docbook.dtd: Fixed copyright and contact info
+	* 40chg.txt, dbcent.mod, dbgenent.mod, dbhier.mod, dbnotn.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd, readme.txt: 
+	Updated version numbers
 
-	* dbpool.mod:
-	Updated copyright notice.  Added IndexTerms to many parameter
-	entities and a couple of content models.  Removed yes.attval
-	and linkendsreq.attrib.
+2000-03-24  Norman Walsh  <ndw@nwalsh.com>
 
-	* dbnotn.mod: Fixed copyright and contact info
+	* 40chg.txt, dbcent.mod, dbgenent.mod, dbhier.mod, dbnotn.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd, readme.txt: 
+	Updated version numbers
 
-	* dbhier.mod:
-	Updated copyright notice. Added IndexTerms to several elements.
-	Changed order of SubTitle outside of *Info elements to:
-	Title, Subtitle?, TitleAbbrev? (in earlier test releases, it
-	was Title, TitleAbbrev?, Subtitle?).
+	* 50issues.txt: Added note about PE reorg
 
-	* dbcent.mod: Fixed copyright and contact info
+	* dbefsyn.mod: Removed
 
-	* 31chg.txt: Improved wording, updated
+	* dbpool.mod: Removed ELEMENT from comments to ease text searching of the DTD.
+	Merged dbefsyn.mod into dbpool.mod
+	Added Modifier as an optional element at the end of MethodSynopsis
+	and MethodParam.
 
-	* dbpool.mod: Added "Journal", "Series", "Set", and "Manuscript" to the
-	list of allowed values in Pubwork on CiteTitle.
+2000-03-07  Norman Walsh  <ndw@nwalsh.com>
 
-1998-12-15  Norman Walsh  <ndw@nwalsh.com>
+	* 40chg.txt, dbcent.mod, dbgenent.mod, dbhier.mod, dbnotn.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd, readme.txt: 
+	Updated internal versions to beta3
 
-	* docbook.dtd:
-	Corrected copyright notice, contact info, and owner identifiers
-	in examples
+2000-03-03  Norman Walsh  <ndw@nwalsh.com>
 
-	* docbook.cat: Corrected contact info
+	* dbpool.mod: Removed erroneous comment about inline synopses
 
-	* dbpool.mod, dbnotn.mod, dbhier.mod:
-	Corrected copyright notice and contact info
+2000-03-02  Norman Walsh  <ndw@nwalsh.com>
 
-	* dbcent.mod: Corrected copyright notice
+	* 30chg.txt, 31chg.txt, 40issues.txt, 50issues.txt, announce.txt, cals-tbl.dtd, dbcent.mod, dbgenent.mod, dbhier.mod, dbnotn.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd, readme.txt: 
+	Version 3.1
 
-	* 50issues.txt:
-	Added note that this list needs to be filled out before V4.0
+	* 30chg.txt, 40issues.txt, announce.txt, cals-tbl.dtd, dbgenent.mod, dbhier.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd: 
+	branches:  1.1.1;
+	Initial revision
 
-	* 31chg.txt:
-	Fixed date, added QAndASet, MediaObject, and InlineMediaObject.
+	* 30chg.txt, 40issues.txt, announce.txt, cals-tbl.dtd, dbgenent.mod, dbhier.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd: 
+	New file.
 
-	* docbook.dcl: Changed version number to 3.1
+	* 31chg.txt, 40chg.txt, 40issues.txt, 50issues.txt, cals-tbl.dtd, dbcent.mod, dbefsyn.mod, dbgenent.mod, dbhier.mod, dbnotn.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd, readme.txt: 
+	Version 4.0beta2
 
-1998-12-14  Norman Walsh  <ndw@nwalsh.com>
+	* 50issues.txt: Added warning about exchange table model
 
-	* dbpool.mod: Fixed typo in definition of qandaset.mix.
+	* dbefsyn.mod, dbpool.mod: Added ooclass, oointerface, and ooexception as wrappers for modifiers
+	and names in classsynopsis. Also allow them inline.
+	
+	Fixed SGML PE parsing problem with hook PEs.
 
-	* dbhier.mod: Removed setinfo.char.mix.  It was unused.
+	* dbhier.mod, dbpool.mod: Added hook PEs for future module extension
 
-	* dbpool.mod: Added CiteTitle to bibliocomponent.mix
+	* dbpool.mod, docbook.dtd: Removed reference to sgml-features PE
 
-	Reworked QAndASet.  DefaultLabel loses the Label value.  Label
-	on Question and Answer becomes an element.  The semantics are
-	that a Label, if present, is always used (which you can override
-	with your stylesheet, if required).
-
-1998-12-07  Norman Walsh  <ndw@nwalsh.com>
-
-	* dbpool.mod:
-	DefaultMark/Mark become DefaultLabel/Label on QandASet/Question/Answer
-
-1998-12-06  Norman Walsh  <ndw@nwalsh.com>
-
-	* dbpool.mod:
-	Added InformalFigure to informal.class, where it had accidentally
-	been left out.
-
-	* dbpool.mod:
-	Changed the 'label' value of DefaultMark on QandASet to 'mark'
-	since the attribute is 'mark'.
-
-	* dbpool.mod: Revised QandASet. QandAEntry now recurses in Answer, not
-	QandAEntry. Question and Answer no longer have a Title,
-	they have a Mark attribute. Renamed Mark attribute on
-	QandASet to DefaultMark.
-
-1998-12-01  Norman Walsh  <ndw@nwalsh.com>
-
-	* 50issues.txt: Branch for 3.1
-
-	* 50issues.txt: Initial version
-
-	* dbgenent.mod, dbhier.mod, docbook.cat, docbook.dcl, docbook.dtd, dbpool.mod:
-	3.1 changes
-
-	* 31chg.txt: Branch for 3.1 testing
-
-	* 31chg.txt: Initial version
-
-	* dbcent.mod, dbnotn.mod: Branch for 3.1 testing
-
-	* dbcent.mod, dbnotn.mod: Initial version
-
-	* 40issues.txt, cals-tbl.dtd, dbgenent.mod, dbhier.mod, dbpool.mod, docbook.cat, docbook.dcl, docbook.dtd:
-	Branch for 3.1 testing
diff --git a/docbook/sgml/dbcent.mod b/docbook/sgml/dbcent.mod
index 170eaaf81..1c8f35e40 100644
--- a/docbook/sgml/dbcent.mod
+++ b/docbook/sgml/dbcent.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook character entities module V4.0 ............................... -->
+<!-- DocBook character entities module V4.1 ............................... -->
 <!-- File dbcent.mod ...................................................... -->
 
 <!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
@@ -36,7 +36,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbcent PUBLIC
-     "-//OASIS//ENTITIES DocBook Character Entities V4.0//EN">
+     "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN">
      %dbcent;
 
      See the documentation for detailed information on the parameter
diff --git a/docbook/sgml/dbgenent.mod b/docbook/sgml/dbgenent.mod
index 405215ca1..b60c5b271 100644
--- a/docbook/sgml/dbgenent.mod
+++ b/docbook/sgml/dbgenent.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook additional general entities V4.0 ............................. -->
+<!-- DocBook additional general entities V4.1 ............................. -->
 
 <!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
      O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
@@ -10,7 +10,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbgenent PUBLIC
-     "-//OASIS//ENTITIES DocBook Additional General Entities V4.0//EN"
+     "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN"
      %dbgenent;
 -->
 
@@ -35,5 +35,5 @@
        %all-titles;
 -->
 
-<!-- End of DocBook additional general entities V4.0 ...................... -->
+<!-- End of DocBook additional general entities V4.1 ...................... -->
 <!-- ...................................................................... -->
diff --git a/docbook/sgml/dbhier.mod b/docbook/sgml/dbhier.mod
index 7f23fc71b..d0dfa4ff4 100644
--- a/docbook/sgml/dbhier.mod
+++ b/docbook/sgml/dbhier.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook document hierarchy module V4.0 ............................... -->
+<!-- DocBook document hierarchy module V4.1 ............................... -->
 <!-- File dbhier.mod ...................................................... -->
 
 <!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
@@ -43,7 +43,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbhier PUBLIC
-     "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.0//EN">
+     "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.1//EN">
      %dbhier;
 
      See the documentation for detailed information on the parameter
@@ -259,12 +259,6 @@ The Contents attribute will be removed from SetInfo
 <![ %book.content.module; [
 <!ENTITY % book.module "INCLUDE">
 <![ %book.module; [
-<!--FUTURE USE (V4.0):
-......................
-The %article.class; entity *may* be removed from the Book content model.
-(Article may be made part of a new top-level document hierarchy.)
-......................
--->
 
 <!ENTITY % local.book.attrib "">
 <!ENTITY % book.role.attrib "%role.attrib;">
@@ -724,7 +718,7 @@ The Contents attribute will be removed from BookInfo
 <!ENTITY % part.module "INCLUDE">
 <![ %part.module; [
 
-<!-- Note that Part was to have its content model reduced in V4.0.  This
+<!-- Note that Part was to have its content model reduced in V4.1.  This
 change will not be made after all. -->
 
 <!ENTITY % local.part.attrib "">
@@ -2064,12 +2058,6 @@ change will not be made after all. -->
 <![ %article.module; [
 <!-- An Article is a chapter-level, stand-alone document that is often,
      but need not be, collected into a Book. -->
-<!--FUTURE USE (V4.0):
-......................
-The %nav.class; entity now allows ToC; ToCchap will be allowed instead.
-RefEntry will be removed from the main content of Article.
-......................
--->
 
 <!ENTITY % local.article.attrib "">
 <!ENTITY % article.role.attrib "%role.attrib;">
@@ -2108,5 +2096,5 @@ RefEntry will be removed from the main content of Article.
 <!--end of article.attlist-->]]>
 <!--end of article.module-->]]>
 
-<!-- End of DocBook document hierarchy module V4.0 ........................ -->
+<!-- End of DocBook document hierarchy module V4.1 ........................ -->
 <!-- ...................................................................... -->
diff --git a/docbook/sgml/dbnotn.mod b/docbook/sgml/dbnotn.mod
index cb6373b89..c750868bd 100644
--- a/docbook/sgml/dbnotn.mod
+++ b/docbook/sgml/dbnotn.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook notations module V4.0 ........................................ -->
+<!-- DocBook notations module V4.1 ........................................ -->
 <!-- File dbnotn.mod ...................................................... -->
 
 <!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
@@ -36,7 +36,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbnotn PUBLIC
-     "-//OASIS//ENTITIES DocBook Notations V4.0//EN">
+     "-//OASIS//ENTITIES DocBook Notations V4.1//EN">
      %dbnotn;
 
      See the documentation for detailed information on the parameter
diff --git a/docbook/sgml/dbpool.mod b/docbook/sgml/dbpool.mod
index 61e31eaca..10c4d3066 100644
--- a/docbook/sgml/dbpool.mod
+++ b/docbook/sgml/dbpool.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook information pool module V4.0 ................................. -->
+<!-- DocBook information pool module V4.1 ................................. -->
 <!-- File dbpool.mod ...................................................... -->
 
 <!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
@@ -49,7 +49,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbpool PUBLIC
-     "-//OASIS//ELEMENTS DocBook Information Pool V4.0//EN">
+     "-//OASIS//ELEMENTS DocBook Information Pool V4.1//EN">
      %dbpool;
 
      See the documentation for detailed information on the parameter
@@ -780,13 +780,6 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
      below. -->
 
 <!ENTITY % local.person.ident.mix "">
-<!--FUTURE USE (V4.0):
-......................
-AuthorBlurb and Affiliation will be removed from %person.ident.mix; and a new
-wrapper element created to allow association of those two elements with
-Author name information.
-......................
--->
 <!ENTITY % person.ident.mix
 		"Honorific|FirstName|Surname|Lineage|OtherName|Affiliation
 		|AuthorBlurb|Contrib %local.person.ident.mix;">
@@ -1920,12 +1913,6 @@ ArticleInfo will be droped from BiblioEntry
 <!--end of glossentry.attlist-->]]>
 <!--end of glossentry.module-->]]>
 
-<!--FUTURE USE (V4.0):
-......................
-GlossTerm *may* be split into an element that appears in a
-Glossary and an element that can appear in the main text.
-......................
--->
 <!-- GlossTerm (defined in the Inlines section, below)-->
 <!ENTITY % glossdef.module "INCLUDE">
 <![ %glossdef.module; [
@@ -4438,13 +4425,6 @@ Coord attribute will be removed from AreaSet
 
 <!ENTITY % author.module "INCLUDE">
 <![ %author.module; [
-<!--FUTURE USE (V4.0):
-......................
-AuthorBlurb and Affiliation will be removed from %person.ident.mix; and a new 
-wrapper element created to allow association of those two elements with 
-Author name information.
-......................
--->
 <!ENTITY % local.author.attrib "">
 <!ENTITY % author.role.attrib "%role.attrib;">
 
@@ -4871,13 +4851,6 @@ Author name information.
 
 <!ENTITY % editor.module "INCLUDE">
 <![ %editor.module; [
-<!--FUTURE USE (V4.0):
-......................
-AuthorBlurb and Affiliation will be removed from %person.ident.mix; and a new 
-wrapper element created to allow association of those two elements with 
-Editor name information.
-......................
--->
 <!ENTITY % local.editor.attrib "">
 <!ENTITY % editor.role.attrib "%role.attrib;">
 
@@ -5062,13 +5035,6 @@ Editor name information.
 
 <!ENTITY % othercredit.module "INCLUDE">
 <![ %othercredit.module; [
-<!--FUTURE USE (V4.0):
-......................
-AuthorBlurb and Affiliation will be removed from %person.ident.mix; and a new 
-wrapper element created to allow association of those two elements with 
-OtherCredit name information.
-......................
--->
 <!ENTITY % local.othercredit.attrib "">
 <!ENTITY % othercredit.role.attrib "%role.attrib;">
 
@@ -5117,13 +5083,6 @@ OtherCredit. -->
 
 <!ENTITY % person.ident.module "INCLUDE">
 <![ %person.ident.module; [
-<!--FUTURE USE (V4.0):
-......................
-AuthorBlurb and Affiliation will be removed from %person.ident.mix; and
-a new wrapper element created to allow association of those two elements
-with Contrib name information.
-......................
--->
   <!ENTITY % contrib.module "INCLUDE">
   <![ %contrib.module; [
   <!ENTITY % local.contrib.attrib "">
@@ -7433,5 +7392,5 @@ the same as %example.mix; although it may not use that PE.
 <!--end of seeseealso.module-->]]>
 <!--end of indexterm.content.module-->]]>
 
-<!-- End of DocBook information pool module V4.0 .......................... -->
+<!-- End of DocBook information pool module V4.1 .......................... -->
 <!-- ...................................................................... -->
diff --git a/docbook/sgml/docbook.cat b/docbook/sgml/docbook.cat
index 4936c674c..2b6b44ad8 100644
--- a/docbook/sgml/docbook.cat
+++ b/docbook/sgml/docbook.cat
@@ -1,5 +1,5 @@
   -- ...................................................................... --
-  -- Catalog data for DocBook V4.0 ........................................ --
+  -- Catalog data for DocBook V4.1 ........................................ --
   -- File docbook.cat ..................................................... --
 
   -- Please direct all questions, bug reports, or suggestions for
@@ -7,34 +7,34 @@
      information, see http://www.oasis-open.org/.
   --
 
-  -- This is the catalog data file for Version 3.1 of the DocBook DTD.
-     It is provided as a convenience in building your own catalog files.
-     You need not use the filenames listed here, and need not use the
-     filename method of identifying storage objects at all.  See the
-     documentation for detailed information on the files associated with
-     the DocBook DTD.  See SGML Open Technical Resolution 9401 for
-     detailed information on supplying and using catalog data.
+  -- This is the catalog data file for DocBook V4.1. It is provided as
+     a convenience in building your own catalog files. You need not use
+     the filenames listed here, and need not use the filename method of
+     identifying storage objects at all.  See the documentation for
+     detailed information on the files associated with the DocBook DTD.
+     See SGML Open Technical Resolution 9401 for detailed information
+     on supplying and using catalog data.
   --
 
   -- ...................................................................... --
   -- SGML declaration associated with DocBook ............................. --
 
-DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl"
+DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl"
 
   -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
-PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd"
+PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd"
 
   -- ...................................................................... --
   -- DocBook modules ...................................................... --
 
 PUBLIC "-//USA-DOD//DTD Table Model 951010//EN" "cals-tbl.dtd"
-PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.0//EN" "dbpool.mod"
-PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.0//EN" "dbhier.mod"
-PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.0//EN" "dbgenent.mod"
-PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod"
-PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.0//EN" "dbcent.mod"
+PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.1//EN" "dbpool.mod"
+PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.1//EN" "dbhier.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN" "dbgenent.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN" "dbcent.mod"
 
   -- ...................................................................... --
   -- ISO entity sets ...................................................... --
@@ -59,5 +59,5 @@ PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
 PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
 PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
 
-  -- End of catalog data for DocBook V4.0 ................................. --
+  -- End of catalog data for DocBook V4.1 ................................. --
   -- ...................................................................... --
diff --git a/docbook/sgml/docbook.dcl b/docbook/sgml/docbook.dcl
index 1cfb808bc..c76de206c 100644
--- a/docbook/sgml/docbook.dcl
+++ b/docbook/sgml/docbook.dcl
@@ -1,6 +1,6 @@
 <!SGML  "ISO 8879:1986"
   -- ...................................................................... --
-  -- DocBook SGML declaration V4.0 ........................................ --
+  -- DocBook SGML declaration V4.1 ........................................ --
   -- file docbook.dcl ..................................................... --
 
 CHARSET
@@ -101,6 +101,6 @@ FEATURES
 
 APPINFO NONE
 
-  -- End of DocBook SGML declaration V4.0 ................................. --
+  -- End of DocBook SGML declaration V4.1 ................................. --
   -- ...................................................................... --
 >
diff --git a/docbook/sgml/docbook.dtd b/docbook/sgml/docbook.dtd
index 31ba9d575..261a72bb6 100644
--- a/docbook/sgml/docbook.dtd
+++ b/docbook/sgml/docbook.dtd
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook DTD V4.0 ..................................................... -->
+<!-- DocBook DTD V4.1 ..................................................... -->
 <!-- File docbook.dtd ..................................................... -->
 
 <!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
@@ -29,21 +29,21 @@
 
 <!-- ...................................................................... -->
 
-<!-- This is the driver file for V4.0 of the DocBook DTD.
+<!-- This is the driver file for V4.1 of the DocBook DTD.
      Please use the following formal public identifier to identify it:
 
-     "-//OASIS//DTD DocBook V4.0//EN"
+     "-//OASIS//DTD DocBook V4.1//EN"
 
      For example, if your document's top-level element is Book, and
      you are using DocBook directly, use the FPI in the DOCTYPE
      declaration:
 
-     <!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook V4.0//EN" [...]>
+     <!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [...]>
 
      Or, if you have a higher-level driver file that customizes DocBook,
      use the FPI in the parameter entity declaration:
 
-     <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook V4.0//EN">
+     <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
      %DocBookDTD;
 
      The DocBook DTD is accompanied by an SGML declaration.
@@ -60,7 +60,7 @@
 <!ENTITY % dbnotn.module "INCLUDE">
 <![ %dbnotn.module; [
 <!ENTITY % dbnotn PUBLIC 
-"-//OASIS//ENTITIES DocBook Notations V4.0//EN">
+"-//OASIS//ENTITIES DocBook Notations V4.1//EN">
 %dbnotn;
 <!--end of dbnotn.module-->]]>
 
@@ -71,7 +71,7 @@
 <![ %dbcent.module; [
 <!ENTITY euro SDATA "[euro  ]"><!-- euro sign, U+20AC NEW -->
 <!ENTITY % dbcent PUBLIC 
-"-//OASIS//ENTITIES DocBook Character Entities V4.0//EN">
+"-//OASIS//ENTITIES DocBook Character Entities V4.1//EN">
 %dbcent;
 <!--end of dbcent.module-->]]>
 
@@ -83,7 +83,7 @@
 <!ENTITY % dbpool.module "INCLUDE">
 <![ %dbpool.module; [
 <!ENTITY % dbpool PUBLIC 
-"-//OASIS//ELEMENTS DocBook Information Pool V4.0//EN">
+"-//OASIS//ELEMENTS DocBook Information Pool V4.1//EN">
 %dbpool;
 <!--end of dbpool.module-->]]>
 
@@ -99,7 +99,7 @@
 <!ENTITY % dbhier.module "INCLUDE">
 <![ %dbhier.module; [
 <!ENTITY % dbhier PUBLIC 
-"-//OASIS//ELEMENTS DocBook Document Hierarchy V4.0//EN">
+"-//OASIS//ELEMENTS DocBook Document Hierarchy V4.1//EN">
 %dbhier;
 <!--end of dbhier.module-->]]>
 
@@ -109,9 +109,9 @@
 <!ENTITY % dbgenent.module "INCLUDE">
 <![ %dbgenent.module; [
 <!ENTITY % dbgenent PUBLIC
-"-//OASIS//ENTITIES DocBook Additional General Entities V4.0//EN">
+"-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN">
 %dbgenent;
 <!--end of dbgenent.module-->]]>
 
-<!-- End of DocBook DTD V4.0 .............................................. -->
+<!-- End of DocBook DTD V4.1 .............................................. -->
 <!-- ...................................................................... -->
diff --git a/docbook/sgml/readme.txt b/docbook/sgml/readme.txt
index e4273c1b9..52d3f9f4a 100644
--- a/docbook/sgml/readme.txt
+++ b/docbook/sgml/readme.txt
@@ -1,6 +1,6 @@
-README for DocBook V4.0
+README for DocBook V4.1
 
-This is DocBook V4.0, released 18 May 2000.
+This is DocBook V4.1, released 19 June 2000.
 
 See 40chg.txt for information about what has changed since DocBook 3.1.