You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by rg...@apache.org on 2005/10/28 23:03:23 UTC
svn commit: r329297 - in
/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy: ./
resources/stylesheets/ src/documentation/content/xdocs/
Author: rgardler
Date: Fri Oct 28 14:02:56 2005
New Revision: 329297
URL: http://svn.apache.org/viewcvs?rev=329297&view=rev
Log:
use the daisy navigation document to definethe URLspace (gives paths and names to the documents instead of the document ID numebr)
Added:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/locationmap.xml (with props)
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl (with props)
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-siteSnippet.xsl (with props)
Removed:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/daisyNavigation-to-siteSnippet.xsl
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/daisy-to-html.xsl
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap?rev=329297&r1=329296&r2=329297&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/input.xmap Fri Oct 28 14:02:56 2005
@@ -37,9 +37,12 @@
<!-- ============================================================== -->
<map:pipeline>
- <map:match pattern="**.daisy.xml">
- <map:generate src="cocoon://{1}.daisy.source" />
- <map:transform src="resources/stylesheets/daisy-to-html.xsl"/>
+ <map:match pattern="**.xml">
+ <map:aggregate element="daisyDocument">
+ <map:part src="cocoon://{1}.daisy.source" />
+ <map:part src="{lm:daisy.siteSnippetFor.{1}}" />
+ </map:aggregate>
+ <map:transform src="{lm:daisy.transform.daisy.html}"/>
<map:transform src="{lm:transform.html.document}"/>
<map:select type="exists">
<map:when test="{project:resources.stylesheets}/daisy/postFilter.xsl">
Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/locationmap.xml?rev=329297&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/locationmap.xml (added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/locationmap.xml Fri Oct 28 14:02:56 2005
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2002-2005 The Apache Software Foundation or its licensors,
+ as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
+
+ <components>
+ <matchers default="lm">
+ <matcher
+ name="lm"
+ src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
+ </matchers>
+ <selectors default="exists">
+ <selector name="exists" logger="sitemap.selector.exists"
+ src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+ </selectors>
+ </components>
+
+ <locator>
+ <match pattern="daisy.transform.*.*">
+ <location src="resources/stylesheets/{1}-to-{2}.xsl"/>
+ </match>
+ </locator>
+</locationmap>
Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/locationmap.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap?rev=329297&r1=329296&r2=329297&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources.xmap Fri Oct 28 14:02:56 2005
@@ -48,9 +48,9 @@
<!-- ============================================================ -->
<map:pipeline>
- <map:match pattern="*.daisy.navigation">
+ <map:match pattern="daisy.site.*">
<map:generate src="{lm:{0}}" />
- <map:transform src="resources/stylesheets/daisyNavigation-to-siteSnippet.xsl"/>
+ <map:transform src="{lm:daisy.transform.navigation.siteSnippet}"/>
<map:serialize type="xml" />
</map:match>
</map:pipeline>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/daisy-to-html.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/daisy-to-html.xsl?rev=329297&r1=329296&r2=329297&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/daisy-to-html.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/daisy-to-html.xsl Fri Oct 28 14:02:56 2005
@@ -20,8 +20,14 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:p="http://outerx.org/daisy/1.0#publisher"
xmlns:ns="http://outerx.org/daisy/1.0"
+ xmlns:nav="http://outerx.org/daisy/1.0#navigationspec"
version="1.0">
- <xsl:template match="/">
+
+ <!-- The pathPrefix is added to the start of all resolved Daisy links
+ It must include a trailing slash if it is non-empty -->
+ <xsl:param name="pathPrefix">/</xsl:param>
+
+ <xsl:template match="daisyDocument">
<xsl:variable name="rootElementName"><xsl:value-of select="name(*)"/></xsl:variable>
<html>
<head>
@@ -155,16 +161,21 @@
<xsl:template match="a">
<xsl:choose>
<xsl:when test="starts-with(@href, 'daisy:')">
+ <xsl:variable name="docId"><xsl:value-of select="substring-after(@href, 'daisy:')"/></xsl:variable>
+ <xsl:variable name="path">
+ <xsl:value-of select="$pathPrefix"/>
+ <xsl:for-each select="//daisyDocument/descendant::doc[@id=$docId][1]/ancestor::group|//daisyDocument/descendant::doc[@id=$docId][1]/ancestor::doc[@nodeId]"><xsl:value-of select="@href"/></xsl:for-each>
+ </xsl:variable>
+ <xsl:variable name="url"><xsl:value-of select="$path"/><xsl:value-of select="//node()[@id=$docId]/@href"/></xsl:variable>
<a>
- <xsl:variable name="url"><xsl:value-of select="substring-after(@href, 'daisy:')"/></xsl:variable>
<xsl:choose>
<xsl:when test="contains($url, '#')">
<xsl:variable name="pageURL"><xsl:value-of select="substring-before($url, '#')"/></xsl:variable>
<xsl:variable name="anchor"><xsl:value-of select="substring-after(@href, '#')"/></xsl:variable>
- <xsl:attribute name="href"><xsl:value-of select="$pageURL"/>.daisy.html#<xsl:value-of select="$anchor"/></xsl:attribute>
+ <xsl:attribute name="href">FIXME: URLS with anchors not working at present - <xsl:value-of select="$pageURL"/>.html#<xsl:value-of select="$anchor"/></xsl:attribute>
</xsl:when>
<xsl:otherwise>
- <xsl:attribute name="href"><xsl:value-of select="$url"/>.daisy.html</xsl:attribute>
+ <xsl:attribute name="href"><xsl:value-of select="$url"/></xsl:attribute>
</xsl:otherwise>
</xsl:choose>
<xsl:attribute name="description"><xsl:value-of select="@daisyDocumentName"/></xsl:attribute>
@@ -186,7 +197,7 @@
<xsl:when test="starts-with(@src, 'daisy:')">
<img>
<xsl:apply-templates select="@*"/>
- <xsl:attribute name="src"><xsl:value-of select="substring-after(@src, 'daisy:')"/>.daisy.img</xsl:attribute>
+ <xsl:attribute name="src">/<xsl:value-of select="substring-after(@src, 'daisy:')"/>.daisy.img</xsl:attribute>
<xsl:apply-templates/>
</img>
</xsl:when>
Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl?rev=329297&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl (added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl Fri Oct 28 14:02:56 2005
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--+
+ | Add an edit link into the page content.
+ +-->
+
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:d="http://outerx.org/daisy/1.0#navigationspec"
+ xmlns="http://apache.org/forrest/locationmap/1.0">
+
+ <xsl:param name="publisherURL"/>
+ <xsl:param name="pathPrefix"/>
+
+ <xsl:template match="/">
+ <locationmap>
+
+ <components>
+ <matchers default="lm">
+ <matcher
+ name="lm"
+ src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
+ </matchers>
+ </components>
+
+ <locator>
+
+ <match pattern="index.xml">
+ <location src="cocoon://2.1/index.xml" />
+ </match>
+
+ <xsl:apply-templates/>
+
+ <match pattern="project.*.daisy.source">
+ <location>
+ <xsl:attribute name="src"><xsl:value-of select="$publisherURL"/>document?documentId={1}&includeNavigation=false&locale=en_US&version=live</xsl:attribute>
+ </location>
+ </match>
+
+ <match pattern="*.daisy.img">
+ <location>
+ <xsl:attribute name="src"><xsl:value-of select="$publisherURL"/>blob?documentId={1}&version=live&partType=3</xsl:attribute>
+ </location>
+ </match>
+
+ <match pattern="daisy.site.*">
+ <location>
+ <xsl:attribute name="src"><xsl:value-of select="$publisherURL"/>blob?documentId={1}&version=live&partType=1</xsl:attribute>
+ </location>
+ </match>
+ </locator>
+ </locationmap>
+ </xsl:template>
+
+ <xsl:template match="d:doc">
+ <xsl:variable name="path">
+ <xsl:for-each select="ancestor::d:group|ancestor::d:doc">
+ <xsl:choose>
+ <xsl:when test="@nodeId"><xsl:value-of select="@nodeId"/>/</xsl:when>
+ <xsl:otherwise>
+ <xsl:if test="name()='d:group'"><xsl:value-of select="@id"/>/</xsl:if>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ <xsl:choose>
+ <xsl:when test="@nodeId"><xsl:value-of select="@nodeId"/></xsl:when>
+ <xsl:otherwise><xsl:value-of select="@id"/></xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <match>
+ <xsl:attribute name="pattern"><xsl:value-of select="$pathPrefix"/><xsl:value-of select="$path"/>.daisy.source</xsl:attribute>
+ <location>
+ <xsl:attribute name="src"><xsl:value-of select="$publisherURL"/>document?documentId=<xsl:value-of select="@id"/>&includeNavigation=false&locale=en_US&version=live</xsl:attribute>
+ </location>
+ </match>
+ <xsl:apply-templates/>
+ </xsl:template>
+
+</xsl:stylesheet>
Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-siteSnippet.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-siteSnippet.xsl?rev=329297&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-siteSnippet.xsl (added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-siteSnippet.xsl Fri Oct 28 14:02:56 2005
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 2002-2005 The Apache Software Foundation or its licensors,
+ as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:d="http://outerx.org/daisy/1.0#navigationspec"
+ version="1.0">
+
+ <xsl:template match="/">
+ <xsl:apply-templates/>
+ </xsl:template>
+
+ <xsl:template match="d:doc">
+ <xsl:choose>
+ <xsl:when test="d:doc">
+ <group>
+ <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+ <xsl:attribute name="label"><xsl:value-of select="@label"/></xsl:attribute>
+ <xsl:if test="@nodeId">
+ <xsl:attribute name="href"><xsl:value-of select="@nodeId"/>/</xsl:attribute>
+ </xsl:if>
+ <doc>
+ <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+ <xsl:attribute name="label">Section Home</xsl:attribute>
+ <xsl:choose>
+ <xsl:when test="@nodeId">
+ <xsl:attribute name="href"><xsl:value-of select="@nodeId"/>.html</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="href"><xsl:value-of select="@id"/>.html</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ </doc>
+ <xsl:apply-templates/>
+ </group>
+ </xsl:when>
+ <xsl:otherwise>
+ <doc>
+ <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+ <xsl:attribute name="label"><xsl:value-of select="@label"/></xsl:attribute>
+ <xsl:choose>
+ <xsl:when test="@nodeId">
+ <xsl:attribute name="href"><xsl:value-of select="@nodeId"/>.html</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="href"><xsl:value-of select="@id"/>.html</xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ </doc>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template match="d:link">
+ <link>
+ <xsl:attribute name="label"><xsl:value-of select="@label"/></xsl:attribute>
+ <xsl:attribute name="href"><xsl:value-of select="@url"/></xsl:attribute>
+ </link>
+ </xsl:template>
+
+ <xsl:template match="d:group">
+ <group>
+ <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+ <xsl:attribute name="label"><xsl:value-of select="@label"/></xsl:attribute>
+ <xsl:attribute name="href">
+ <xsl:choose>
+ <xsl:when test="@nodeId"><xsl:value-of select="@nodeId"/>/</xsl:when>
+ <xsl:otherwise><xsl:value-of select="@id"/>/</xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <xsl:apply-templates/>
+ </group>
+ </xsl:template>
+</xsl:stylesheet>
Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-siteSnippet.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml?rev=329297&r1=329296&r2=329297&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.input.Daisy/src/documentation/content/xdocs/index.xml Fri Oct 28 14:02:56 2005
@@ -31,83 +31,38 @@
<section>
<title>Usage</title>
- <p>Perhaps the most important thing to realise about this plugin is that
- there is no relationship between the Forrest URL space and the URL space
- defined in the Daisy repository. That is the path to and the name of each
- document within Forrest needs not be the same as the path to and the name
- of the document within the Daisy repository.</p>
-
- <p>This enables the repository to be structured in a way that is
- appropriate for it's editors and the Forrest document collection can
- be structured in a way that is appropriate for the target audience. In
- fact, it is possible to use the same document from a Daisy repository in
- multiple Forrest collections each using a completely different URL
- space that is custom designed for the end user of the document
- collection.</p>
+ <p>This plugin allows content to be retrieved from a
+ <a href="http://www.cocoondev.org/daisy/">Daisy CMS repository</a>
+ and displayed alongside any other Forrest content. Unlike many
+ other plugins there is some configuraiton of your project requried.</p>.
<section>
- <title>Locationmap</title>
+ <title>Locationmap Configuration</title>
- <p>In order to tell Forrest which document to retrieve from the
- repository you need to make use of the locationmap in Forrest. Your
- project must therefore provide a locationmap similar to the one
- that follows.</p>
-
- <warning>The HTTP API in Daisy 1.3 has changed. The code below is for
- Daisy 1.2. We currently have experimental support for Daisy 1.3, if you
- wish to work with this version of daisy you should discuss your needs with
- the Forrest mail lists.</warning>
+ <p>The project locationmap for a Daisy generated site is automatically
+ created from the daisy navigation documents. In order to tell Forrest
+ how to generate these documents you must add a matcher to your
+ project sitemap as follows:</p>
<source><![CDATA[
-<locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
-
- <components>
- <matchers default="lm">
- <matcher
- name="lm"
- src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
- </matchers>
- </components>
-
- <locator>
-
- <match pattern="index.xml">
- <location src="cocoon://908.daisy.xml" />
- </match>
-
- <match pattern="*.daisy.source">
- <location src="http://username:password@repository.domain.com:9263/publisher/document?documentId={1}&includeNavigation=false&locale=en_US&version=live" />
- </match>
-
- <match pattern="*.daisy.img">
- <location src="http://username:password@repository.domain.com:9263/publisher/blob?documentId={1}&version=live&partType=3" />
- </match>
-
- <match pattern="*.daisy.navigation">
- <location src="http://username:password@repository.domain.com:9263/publisher/blob?documentId={1}&version=live&partType=1" />
- </match>
-
- </locator>
-</locationmap>
+<map:match pattern="locationmap-project.xml">
+ <map:generate src="http://username:password@rop.domain.org:9263/publisher/blob?documentId=NAVIGATION-DOCUMENT-ID&version=live&partType=1"/>
+ <map:transform src="{forrest:plugins}/org.apache.forrest.plugin.input.Daisy/resources/stylesheets/navigation-to-locationmap.xsl">
+ <map:parameter name="publisherURL" value="http://username:password@repo.domain.org:9263/publisher/"/>
+ <map:parameter name="pathPrefix" value="/"/>
+ </map:transform>
+ <map:serialize type="xml"/>
+</map:match>
]]></source>
- <p>The first match (<code>pattern="index.xml"</code>) will redirect
- the request for index.xml to a named document
- in the daisy repository. If you provide your index.xml file locally then omit
- this matcher.</p>
-
- <p>The next match (<code>pattern="*.daisy.source"</code>) is used by the plugin
- to resolve requests for daisy documents.</p>
+ <p>Note that we use <code>xi:include</code> to include a navigation
+ document in the site.xml file, in this case the document retrieved has
+ id 1208. By using include in this way the site editor is free to use
+ site.xml to reference content from other sources.</p>
- <p>The next match (<code>pattern="*.daisy.img"</code>) is used by the plugin
- to resolve requests for images stored in the daisy repository.</p>
-
- <p>The next match (<code>pattern="*.daisy.navigation"</code>) is used by the plugin
- to resolve requests for daisy navigation documents.</p>
+ <p>The <code>pathPrefix</code> is a prefix added to all paths to documents
+ that are to be retrieved from the Daisy repository.</p>
- <note>In a future version of Forrest it planned to allow plugins to provide
- locationmaps of their own. Therefore, the need for a project to provide this
- locationmap will be removed.</note>
</section>
<section>
@@ -127,11 +82,6 @@
<xi:include href="cocoon://1208.daisy.navigation"/>
</site>
]]></source>
-
- <p>Note that we use <code>xi:include</code> to include a navigation
- document in the site.xml file, in this case the document retrieved has
- id 1208. By using include in this way the site editor is free to use
- site.xml to reference content from other sources.</p>
</section>
<section>