Automated merge with https://hg.netbeans.org/main/contrib/
authorJesse Glick <jglick@netbeans.org>
Fri, 14 Jan 2011 16:48:04 -0500
changeset 172922fdd1934b78c
parent 17290 c5c58d881d3e
parent 17291 29c786a82acb
child 17293 598fb94dcdda
Automated merge with https://hg.netbeans.org/main/contrib/
     1.1 --- a/docbook/manifest.mf	Fri Jan 14 16:51:32 2011 +0100
     1.2 +++ b/docbook/manifest.mf	Fri Jan 14 16:48:04 2011 -0500
     1.3 @@ -1,7 +1,7 @@
     1.4  Manifest-Version: 1.0
     1.5  OpenIDE-Module: org.netbeans.modules.docbook
     1.6  OpenIDE-Module-Java-Dependencies: Java > 1.6
     1.7 -OpenIDE-Module-Specification-Version: 1.32
     1.8 +OpenIDE-Module-Specification-Version: 1.33
     1.9  OpenIDE-Module-Layer: org/netbeans/modules/docbook/resources/layer.xml
    1.10  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/docbook/Bundle.properties
    1.11  
     2.1 --- a/docbook/src/org/netbeans/modules/docbook/DocBookCatalog.java	Fri Jan 14 16:51:32 2011 +0100
     2.2 +++ b/docbook/src/org/netbeans/modules/docbook/DocBookCatalog.java	Fri Jan 14 16:48:04 2011 -0500
     2.3 @@ -72,10 +72,8 @@
     2.4                              "nbres:/org/netbeans/modules/docbook/lib/slides-" + Config.SLIDES_VERSION + "/schema/dtd/slides.dtd");
     2.5          PUBLIC_2_SYSTEM.put("-//OASIS//DTD DocBook XML V" + Config.DOCBOOK_XML_VERSION + "//EN",
     2.6                              "nbres:/org/netbeans/modules/docbook/lib/docbook-xml-" + Config.DOCBOOK_XML_VERSION + "/docbookx.dtd");
     2.7 -        PUBLIC_2_SYSTEM.put("-//OASIS//DTD DocBook XML V4.4//EN",
     2.8 -                            "nbres:/org/netbeans/modules/docbook/lib/docbook-xml-" + Config.DOCBOOK_XML_VERSION + "/docbookx.dtd");
     2.9 -        PUBLIC_2_SYSTEM.put("-//Sun Microsystems//DTD XML-SolBook 3.5 //EN",
    2.10 -                            "nbres:/org/netbeans/modules/docbook/lib/solbook-xml-" + Config.SOLBOOK_XML_VERSION + "/solbookx.dtd--public2system");
    2.11 +//        PUBLIC_2_SYSTEM.put("-//Sun Microsystems//DTD XML-SolBook 3.5//EN",
    2.12 +//                            "nbres:/org/netbeans/modules/docbook/lib/solbook-xml-" + Config.SOLBOOK_XML_VERSION + "/solbookx.dtd--public2system");
    2.13          // XXX slides-full.dtd
    2.14      }
    2.15