projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e91e640)
Upgrade to DocBook V4.2 SGML.
authorPeter Eisentraut
Mon, 24 Nov 2003 19:08:02 +0000 (19:08 +0000)
committerPeter Eisentraut
Mon, 24 Nov 2003 19:08:02 +0000 (19:08 +0000)
12 files changed:
configure patch | blob | blame | history
configure.in patch | blob | blame | history
doc/src/sgml/cvs.sgml patch | blob | blame | history
doc/src/sgml/ddl.sgml patch | blob | blame | history
doc/src/sgml/dml.sgml patch | blob | blame | history
doc/src/sgml/docguide.sgml patch | blob | blame | history
doc/src/sgml/ecpg.sgml patch | blob | blame | history
doc/src/sgml/geqo.sgml patch | blob | blame | history
doc/src/sgml/nls.sgml patch | blob | blame | history
doc/src/sgml/postgres.sgml patch | blob | blame | history
doc/src/sgml/standalone-install.sgml patch | blob | blame | history
doc/src/sgml/user-manag.sgml patch | blob | blame | history

diff --git a/configure b/configure
index 6e4781f396866fd44cee46cd13e781120c9af48d..94f0917fc23b3a356a807da6086f2a71831f6f52 100755 (executable)
--- a/configure
+++ b/configure
@@ -17451,13 +17451,13 @@ fi
 done
 
 
-echo "$as_me:$LINENO: checking for DocBook V3.1" >&5
-echo $ECHO_N "checking for DocBook V3.1... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for DocBook V4.2" >&5
+echo $ECHO_N "checking for DocBook V4.2... $ECHO_C" >&6
 if test "${pgac_cv_check_docbook+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.sgml <
-3.1//EN">
+4.2//EN">
 
  test
  
diff --git a/configure.in b/configure.in
index 2b64964894122dc0817f66991e3a0f08b45a3ba2..6e4473c53b4753eb2d76ff717ce0e906bc6ba684 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Header: /cvsroot/pgsql/configure.in,v 1.304 2003/11/24 14:52:57 petere Exp $
+dnl $Header: /cvsroot/pgsql/configure.in,v 1.305 2003/11/24 19:08:01 petere Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -1236,7 +1236,7 @@ fi
 #
 PGAC_PROG_NSGMLS
 PGAC_PROG_JADE
-PGAC_CHECK_DOCBOOK(3.1)
+PGAC_CHECK_DOCBOOK(4.2)
 PGAC_PATH_DOCBOOK_STYLESHEETS
 PGAC_PATH_COLLATEINDEX
 AC_CHECK_PROGS(SGMLSPL, sgmlspl)
diff --git a/doc/src/sgml/cvs.sgml b/doc/src/sgml/cvs.sgml
index 26b7848b417eb0196782497d489909f6f3031536..19876c99ef23496521c3bfed6d35df3b24a7818f 100644 (file)
--- a/doc/src/sgml/cvs.sgml
+++ b/doc/src/sgml/cvs.sgml
@@ -1,11 +1,9 @@
 
 
 
- <docinfo>
+ <appendixinfo>
   
    
     Marc
@@ -21,7 +19,7 @@ Thomas Lockhart
    
   
   1999-05-20
- docinfo>
+ appendixinfo>
 
  The <productname>CVS</productname> Repository
 
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index 627f25096b4fa36d032ef511cf3d5fca65eae5bf..afc8632789fa962e9cb011b4f60e4ca00c970516 100644 (file)
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -1,4 +1,4 @@
-
+
 
 
  Data Definition
@@ -956,8 +956,8 @@ CREATE TABLE order_items (
  
   Inheritance
 
-  <comment>This section needs to be rethought.  Some of the
-  information should go into the following chapters.comment>
+  <remark>This section needs to be rethought.  Some of the
+  information should go into the following chapters.remark>
 
   
    Let's create two tables. The capitals  table  contains
diff --git a/doc/src/sgml/dml.sgml b/doc/src/sgml/dml.sgml
index fb9cbf974903ddfad6929ba48a5bafeca63542a1..e7c26c10ff300ca48d4b025d3368f90b93762c78 100644 (file)
--- a/doc/src/sgml/dml.sgml
+++ b/doc/src/sgml/dml.sgml
@@ -1,11 +1,11 @@
-
+
 
 
  Data Manipulation
 
- <comment>
+ <remark>
   This chapter is still quite incomplete.
- comment>
+ remark>
 
  
   The previous chapter discussed how to create tables and other
diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml
index 6dd0d233a89f313914373cd1100bb8f542ec4f05..0284e2b5232ab508c80a21870ebc254ee2a0842a 100644 (file)
--- a/doc/src/sgml/docguide.sgml
+++ b/doc/src/sgml/docguide.sgml
@@ -1,4 +1,4 @@
-
+
 
 
  Documentation
@@ -86,7 +86,7 @@
      
       
        This is the definition of DocBook itself.  We currently use
-       version 3.1; you cannot use later or earlier versions.  Note
+       version 4.2; you cannot use later or earlier versions.  Note
        that there is also an XML version of DocBook
        -- do not use that.
       
@@ -205,9 +205,6 @@
      
       textproc/openjade
      
-     
-      textproc/docbook-310
-     
      
       textproc/iso8879
      
@@ -215,6 +212,11 @@
       textproc/dsssl-docbook-modular
      
     
+    Apparently, there is no port for the DocBook V4.2 SGML DTD
+    available right now.  You will need to install it manually.
+   
+
+   
     A number of things from /usr/ports/print
     (tex, jadetex) might
     also be of interest.
@@ -225,7 +227,7 @@
     in /usr/local/share/sgml/catalog.  Be sure to
     have the following line in there:
 
-CATALOG "/usr/local/share/sgml/docbook/3.1/catalog"
+CATALOG "/usr/local/share/sgml/docbook/4.2/docbook.cat"
 
     If you do not want to edit the file you can also set the
     environment variable SGML_CATALOG_FILES to a
@@ -331,20 +333,20 @@ CATALOG "dsssl/catalog"
      
       
        Obtain the 
-       url="http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip">DocBook
-       V3.1 distribution.
+       url="http://www.docbook.org/sgml/4.2/docbook-4.2.zip">DocBook
+       V4.2 distribution.
       
      
 
      
       
        Create the directory
-       /usr/local/share/sgml/docbook31 and change
+       /usr/local/share/sgml/docbook-4.2 and change
        to it. (The exact location is irrelevant, but this one is
        reasonable within the layout we are following here.)
 
-$ mkdir /usr/local/share/sgml/docbook31
-$ cd /usr/local/share/sgml/docbook31
+$ mkdir /usr/local/share/sgml/docbook-4.2
+$ cd /usr/local/share/sgml/docbook-4.2
 
       
      
@@ -353,7 +355,7 @@ CATALOG "dsssl/catalog"
       
        Unpack the archive.
 
-$ unzip -a ...../docbk31.zip
+$ unzip -a ...../docbook-4.2.zip
 
        (The archive will unpack its files into the current directory.)
       
@@ -366,7 +368,7 @@ CATALOG "dsssl/catalog"
        you told jade during installation) and put a line like this
        into it:
 
-CATALOG "docbook31/docbook.cat"
+CATALOG "docbook-4.2/docbook.cat"
 
       
      
@@ -388,7 +390,7 @@ CATALOG "docbook31/docbook.cat"
        character entities archive, unpack it, and put the
        files in the same directory you put the DocBook files in.
 
-$ cd /usr/local/share/sgml/docbook31
+$ cd /usr/local/share/sgml/docbook-4.2
 $ unzip ...../ISOEnts.zip
 
       
@@ -504,7 +506,7 @@ CATALOG "docbook-dsssl--1.xx/catalog
 
 checking for onsgmls... onsgmls
 checking for openjade... openjade
-checking for DocBook V3.1... yes
+checking for DocBook V4.2... yes
 checking for DocBook stylesheets... /usr/lib/sgml/stylesheets/nwalsh-modular
 checking for sgmlspl... sgmlspl
 
@@ -512,7 +514,7 @@ checking for sgmlspl... sgmlspl
    If neither onsgmls nor
    nsgmls were found then you will not see the
    remaining 4 lines.  nsgmls is part of the Jade
-   package.  If DocBook V3.1 was not found then you did
+   package.  If DocBook V4.2 was not found then you did
    not install the DocBook DTD kit in a place where jade can find it,
    or you have not set up the catalog files correctly.  See the
    installation hints above.  The DocBook stylesheets are looked for
@@ -1034,7 +1036,7 @@ End:
      the first line look like this:
 
 
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V3.1//EN">
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V4.2//EN">
 
 
      This means that anything and everything that reads
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index 0e426b179bb2d72965f3a62e92dd6589fd82c97f..7bdc4df77f54be5399d012f07ca9e756516f757a 100644 (file)
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -1,5 +1,5 @@
 
 
 
@@ -668,7 +668,7 @@ EXEC SQL DEALLOCATE PREPARE name;
 EXEC SQL ALLOCATE DESCRIPTOR identifier;
 
    The identifier serves as the variable name of the
-   descriptor area.  <comment>The scope of the allocated descriptor is WHAT?.>
+   descriptor area.  <remark>The scope of the allocated descriptor is WHAT?.>
    When you don't need the descriptor anymore, you should deallocate
    it:
 
diff --git a/doc/src/sgml/geqo.sgml b/doc/src/sgml/geqo.sgml
index a4622edcf1f996a0e9bac438aa8adc65b721a90e..70d5eec96f6bc51774eb42d033a41441e803410d 100644 (file)
--- a/doc/src/sgml/geqo.sgml
+++ b/doc/src/sgml/geqo.sgml
@@ -1,10 +1,10 @@
 
 
  
-  <docinfo>
+  <chapterinfo>
    
     Martin
     Utesch
@@ -26,7 +26,7 @@ Genetic Optimizer
     
    
    1997-10-02
-  docinfo>
+  chapterinfo>
 
   Genetic Query Optimizer
 
diff --git a/doc/src/sgml/nls.sgml b/doc/src/sgml/nls.sgml
index d857b66bb5cbee4960178734218df50c9fabbe73..4959e452199aad80ff5477811f26555788400b46 100644 (file)
--- a/doc/src/sgml/nls.sgml
+++ b/doc/src/sgml/nls.sgml
@@ -1,14 +1,14 @@
 
 
 
- <docinfo>
+ <chapterinfo>
   
    Peter
    Eisentraut
   
- docinfo>
+ chapterinfo>
 
  Native Language Support
 
diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml
index c7e0864f5ca72b04c0ed54fe639dcadaaa259f28..1a629d780288cfa25ed4518f26a687dbfdb46523 100644 (file)
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -1,8 +1,8 @@
 
 
-3.1//EN" [
+4.2//EN" [
 
 
 %version;
diff --git a/doc/src/sgml/standalone-install.sgml b/doc/src/sgml/standalone-install.sgml
index 349e5d2972d80dfee0becba8a5fd3ae68ac930cd..3e773c019758bec975f2e93da57c34543f634c93 100644 (file)
--- a/doc/src/sgml/standalone-install.sgml
+++ b/doc/src/sgml/standalone-install.sgml
@@ -1,4 +1,4 @@
-
+
 
 
 
-doctype chapter PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
+DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [
 
 
 %version;
diff --git a/doc/src/sgml/user-manag.sgml b/doc/src/sgml/user-manag.sgml
index 8eca4794833a7fd8b14177edd5fcba5ec1dd84f7..19d18eaefc2c1221298afef0f78f066468e40510 100644 (file)
--- a/doc/src/sgml/user-manag.sgml
+++ b/doc/src/sgml/user-manag.sgml
@@ -1,5 +1,5 @@
 
 
 
@@ -224,7 +224,7 @@ ALTER GROUP name DROP USER uname1
    REVOKE
   
 
-  <comment>Being moved to the DDL chapter.  Will eventually disappear here.>
+  <remark>Being moved to the DDL chapter.  Will eventually disappear here.>
 
   
    When a database object is created, it is assigned an owner. The
This is the main PostgreSQL git repository.