cziegeler 2003/09/02 06:53:11
Modified: src/documentation/xdocs/faq faq-selectors.xml
faq-matchers.xml
src/documentation/xdocs/userdocs/advanced/flow
jxtemplate.xml velocity.xml
src/documentation sitemap.xmap
src/documentation/xdocs/tutorial tutorial-generator.xml
Log:
FIxing more links
Revision Changes Path
1.3 +1 -1 cocoon-2.1/src/documentation/xdocs/faq/faq-selectors.xml
Index: faq-selectors.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/faq/faq-selectors.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- faq-selectors.xml 2 Sep 2003 13:17:34 -0000 1.2
+++ faq-selectors.xml 2 Sep 2003 13:53:10 -0000 1.3
@@ -30,7 +30,7 @@
<answer>
<p>
-Both matchers and selectors can be used to determine the flow, order, and
components involved in request processing. Their differences include the
complexity of the decisions they can make about processing as well as the
values they return to the sitemap. For a more detailed discussion of their
similarities and differences, see <link
href="../userdocs/concepts/matchers_selectors.html">Using and Implementing
Matchers and Selectors</link>.
+Both matchers and selectors can be used to determine the flow, order, and
components involved in request processing. Their differences include the
complexity of the decisions they can make about processing as well as the
values they return to the sitemap. For a more detailed discussion of their
similarities and differences, see <link
href="../userdocs/user/advanced/matchers_selectors.html">Using and Implementing
Matchers and Selectors</link>.
</p>
</answer>
1.4 +1 -1 cocoon-2.1/src/documentation/xdocs/faq/faq-matchers.xml
Index: faq-matchers.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/faq/faq-matchers.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- faq-matchers.xml 2 Sep 2003 13:17:34 -0000 1.3
+++ faq-matchers.xml 2 Sep 2003 13:53:10 -0000 1.4
@@ -32,7 +32,7 @@
<answer>
<p>
-Both matchers and selectors can be used to determine the flow, order, and
components involved in request processing. Their differences include the
complexity of the decisions they can make about processing as well as the
values they return to the sitemap. For a more detailed discussion of their
similarities and differences, see <link
href="../userdocs/concepts/matchers_selectors.html">Using and Implementing
Matchers and Selectors</link>.
+Both matchers and selectors can be used to determine the flow, order, and
components involved in request processing. Their differences include the
complexity of the decisions they can make about processing as well as the
values they return to the sitemap. For a more detailed discussion of their
similarities and differences, see <link
href="../userdocs/user/advanced/matchers_selectors.html">Using and Implementing
Matchers and Selectors</link>.
</p>
</answer>
1.4 +4 -4
cocoon-2.1/src/documentation/xdocs/userdocs/advanced/flow/jxtemplate.xml
Index: jxtemplate.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/advanced/flow/jxtemplate.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jxtemplate.xml 2 Sep 2003 12:56:17 -0000 1.3
+++ jxtemplate.xml 2 Sep 2003 13:53:10 -0000 1.4
@@ -39,16 +39,16 @@
from a Flowscript. In addition the following implicit objects are available
as
both JXPath and Jexl variables in a template:</p>
<dl>
-<dt><link
href="../../../apidocs/java/org/apache/cocoon/environment/Request.html"><code>org.apache.cocoon.environment.Request</code></link><code>
request</code></dt>
+<dt><link
href="../../../apidocs/org/apache/cocoon/environment/Request.html"><code>org.apache.cocoon.environment.Request</code></link><code>
request</code></dt>
<dd><br/>The current Cocoon request<br/></dd>
-<dt><br/><link
href="../../../apidocs/java/org/apache/cocoon/environment/Response.html"><code>org.apache.cocoon.environment.Response</code></link><code>
response</code></dt>
+<dt><br/><link
href="../../../apidocs/org/apache/cocoon/environment/Response.html"><code>org.apache.cocoon.environment.Response</code></link><code>
response</code></dt>
<dd><br/>The Cocoon response associated with the current request<br/></dd>
-<dt><br/><link
href="../../../apidocs/java/org/apache/cocoon/environment/Session.html"><code>org.apache.cocoon.environment.Session</code></link><code>
session</code></dt>
+<dt><br/><link
href="../../../apidocs/org/apache/cocoon/environment/Session.html"><code>org.apache.cocoon.environment.Session</code></link><code>
session</code></dt>
<dd><br/>The Cocoon session associated with the current request<br/></dd>
-<dt><br/><link
href="../../../apidocs/java/org/apache/cocoon/environment/Context.html"><code>org.apache.cocoon.environment.Context</code></link><code>
context</code></dt>
+<dt><br/><link
href="../../../apidocs/org/apache/cocoon/environment/Context.html"><code>org.apache.cocoon.environment.Context</code></link><code>
context</code></dt>
<dd><br/>The Cocoon context associated with the current request<br/></dd>
<dt><br/><code>org.apache.avalon.framework.parameter.Parameter[]</code><code>
parameters</code></dt>
1.4 +4 -4
cocoon-2.1/src/documentation/xdocs/userdocs/advanced/flow/velocity.xml
Index: velocity.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/advanced/flow/velocity.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- velocity.xml 2 Sep 2003 13:17:34 -0000 1.3
+++ velocity.xml 2 Sep 2003 13:53:10 -0000 1.4
@@ -27,13 +27,13 @@
</source>
<p>In addition the following implicit objects are always available in the
Velocity context:</p>
<dl>
- <dt><link
href="../../../apidocs/java/org/apache/cocoon/environment/Request.html">Request</link>
<code>$request</code> </dt>
+ <dt><link
href="../../../apidocs/org/apache/cocoon/environment/Request.html">Request</link>
<code>$request</code> </dt>
<dd>The current Cocoon request</dd>
- <dt><link
href="../../../apidocs/java/org/apache/cocoon/environment/Response.html">Response</link>
<code>$response</code> </dt>
+ <dt><link
href="../../../apidocs/org/apache/cocoon/environment/Response.html">Response</link>
<code>$response</code> </dt>
<dd>The Cocoon response associated with the current request</dd>
- <dt><link
href="../../../apidocs/java/org/apache/cocoon/environment/Session.html">Session</link>
<code>$session</code> </dt>
+ <dt><link
href="../../../apidocs/org/apache/cocoon/environment/Session.html">Session</link>
<code>$session</code> </dt>
<dd>The Cocoon session associated with the current request</dd>
- <dt><link
href="../../../apidocs/java/org/apache/cocoon/environment/Context.html">Context</link>
<code>$context</code> </dt>
+ <dt><link
href="../../../apidocs/org/apache/cocoon/environment/Context.html">Context</link>
<code>$context</code> </dt>
<dd>The Cocoon context associated with the current request</dd>
<dt><code>org.apache.avalon.framework.parameters.Parameters</code>
<code>$parameters</code> </dt>
<dd>Any parameters passed to the generator in the pipeline</dd>
1.10 +3 -0 cocoon-2.1/src/documentation/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/documentation/sitemap.xmap,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sitemap.xmap 12 Aug 2003 09:29:10 -0000 1.9
+++ sitemap.xmap 2 Sep 2003 13:53:10 -0000 1.10
@@ -143,6 +143,9 @@
<!-- http://xml.apache.org/forrest/sitemap-ref.html#source_pipelines
-->
<!-- COCOON SPECIFIC -->
+ <map:match pattern="apidocs/**">
+ <map:read src="../../javadocs/{1}"/>
+ </map:match>
<map:match pattern="changes.xml">
<map:mount uri-prefix="" src="status.xmap" check-reload="yes" />
</map:match>
1.7 +1 -1
cocoon-2.1/src/documentation/xdocs/tutorial/tutorial-generator.xml
Index: tutorial-generator.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/documentation/xdocs/tutorial/tutorial-generator.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tutorial-generator.xml 2 Sep 2003 13:17:33 -0000 1.6
+++ tutorial-generator.xml 2 Sep 2003 13:53:11 -0000 1.7
@@ -93,7 +93,7 @@
<li>Read
<link href="../userdocs/concepts/index.html">Cocoon
Concepts</link>
, as well as
- <link href="../developing/extending.html">Extending
Cocoon</link>
+ <link href="../userdocs/developer/extending.html">Extending
Cocoon</link>
, and the broad overview of
<link
href="../userdocs/developer/avalon/preface.html">Avalon</link>
