On Thu, 2005-06-02 at 08:17 -0400, James Laska wrote: > > My rough understanding was that the local imports need to come after the > system imports so that the local settings overload system-wide settings. > So I think the order and type of imports in main-html.xsl is incorrect. > If you look inside chunk.xsl ... it already imports docbook.xsl, > chunk-common.xsl, manifest.xsl, and chunk-code.xsl. I modified all our > Makefile's to use the new main-html-chunk.xsl and main-html-nochunk.xsl. > That would be my recommendation going forward. OK, I think the problem is dropping the import of docbook.xsl from redhat.xsl *and* using the current Makefile + main-html.xsl. main- html.xsl doesn't call docbook.xsl, it relied upon redhat.xsl to do that. Here's what we'll do: * I'm going to check in a new main-html.xsl that imports docbook.xsl * I'm going to revert redhat.xsl to not import docbook.xsl, so nochunks works right * Within the next week we're going to write master Makefile and put it in common/. Everyone will need to upgrade to that going forward. * When that new Makefile is up, we'll deprecate the older Makefile as well as main-html.xsl -and- the redhat.xsl that imports docbook.xsl. What should you do? You can likely wait a week and get the new stuff. If you want no chunking right away, you can update to the new stuff in xsl/ and try out the temporary master Makefile I will put there. cheers - Karsten > Thoughts? > James Laska > > > > On Wed, 2005-06-01 at 17:04 -0700, Karsten Wade wrote: > > For those not on the commits list ... or overwhelmed by the entries this > > week ... > > > > I checked in a change to redhat.xsl that caused a build error in the > > install-guide module. This change to the XSL had been to support the > > no-chunking (single HTML file output from DocBook) that James Laska > > patched. The no-chunking is working great, but this particular change > > isn't. This is me checking my local 1.2 against the 1.3 version that > > caused the regression: > > > > [kwade@erato xsl]$ diff -u redhat.xsl.~1.2.~ redhat.xsl > > --- redhat.xsl.~1.2.~ 2003-10-01 12:02:56.000000000 -0700 > > +++ redhat.xsl 2005-05-30 12:05:47.000000000 -0700 > > @@ -7,7 +7,6 @@ > > version="1.0" > > exclude-result-prefixes="exsl"> > > > > -<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl"/> > > > > <!-- This sets the extension for HTML files to ".html". --> > > <!-- (The stylesheet's default for XHTML files is ".xhtm".) --> > > > > I reverted the XSL to 1.2 and tried it out locally. Both the > > Installation Guide (chunking) and the Release Notes (no-chunking) built > > ok. For the FC4 release, those are the only two we care about. > > > > James, what problems did you have with the docbook.xsl being imported at > > that point in redhat.xsl? > > > > - Karsten > > On Wed, 2005-06-01 at 19:58 -0400, Karsten Wade wrote: > > > Author: kwade > > > > > > Update of /cvs/docs/xsl > > > In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14057 > > > > > > Modified Files: > > > redhat.xsl > > > Log Message: > > > This is probably the wrong way to do this, I reverted to 1.1 when I > > > meant to rever to 1.2, so I am now recommitting 1.2. The version in > > > 1.3 caused a regression in the Installation Guide and I'm sure all > > > other guides. Ver. 1.3 had removed the import of docbook.xsl, which > > > caused the build to fail. I tested this version 1.2 on release- > > > notes/FC4/ and the install-guide/ and it seems to work with chunking > > > and non-chunking. I will talk with jlaska and find out why he removed > > > this call ... I know it broke something for them. Further regressions > > > are a possibility, just hopefully not in the only two documents that > > > we *must* have build for FC4. > > > > > > > > > Index: redhat.xsl > > > =================================================================== > > > RCS file: /cvs/docs/xsl/redhat.xsl,v > > > retrieving revision 1.1 > > > retrieving revision 1.2 > > > diff -u -r1.1 -r1.2 > > > --- redhat.xsl 17 Jul 2003 19:48:07 -0000 1.1 > > > +++ redhat.xsl 1 Jun 2005 23:58:27 -0000 1.2 > > > @@ -1,4 +1,4 @@ > > > -<!-- created by Tammy Fox tfox@xxxxxxxxxx for the RHL Project --> > > > +<!-- created by Tammy Fox tfox@xxxxxxxxxx for the Fedora Project --> > > > <!-- License: GPL --> > > > <!-- Copyright 2003 Tammy Fox, Red Hat, Inc. --> > > > > > > > > -- > > > > fedora-docs-list@xxxxxxxxxx > > To unsubscribe: > > http://www.redhat.com/mailman/listinfo/fedora-docs-list > -- Karsten Wade, RHCE * Sr. Tech Writer * http://people.redhat.com/kwade/ gpg fingerprint: 2680 DBFD D968 3141 0115 5F1B D992 0E06 AD0E 0C41 Red Hat SELinux Guide http://www.redhat.com/docs/manuals/enterprise/RHEL-4-Manual/selinux-guide/
Attachment:
signature.asc
Description: This is a digitally signed message part
-- fedora-docs-list@xxxxxxxxxx To unsubscribe: http://www.redhat.com/mailman/listinfo/fedora-docs-list
