Author: crossley
Date: Sat Apr 7 01:35:39 2007
New Revision: 526406
URL: http://svn.apache.org/viewvc?view=rev&rev=526406
Log:
Whitespace changes only. Using xmlformat. Issue: FOR-644
Modified:
forrest/trunk/whiteboard/doco/content/authoring/index.xml
forrest/trunk/whiteboard/doco/content/authoring/index/index_en.xml
forrest/trunk/whiteboard/doco/content/authoring/index/xdoc/index_en.xml
forrest/trunk/whiteboard/doco/content/authoring/tabs.xml
forrest/trunk/whiteboard/doco/content/locationmap.xml
forrest/trunk/whiteboard/doco/content/trash/sitetree.xml
forrest/trunk/whiteboard/doco/resources/structurer/resource-types/xhtml.fv
Modified: forrest/trunk/whiteboard/doco/content/authoring/index.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/doco/content/authoring/index.xml?view=diff&rev=526406&r1=526405&r2=526406
==============================================================================
--- forrest/trunk/whiteboard/doco/content/authoring/index.xml (original)
+++ forrest/trunk/whiteboard/doco/content/authoring/index.xml Sat Apr 7
01:35:39 2007
@@ -15,23 +15,29 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
<html xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns="http://www.w3.org/1999/xhtml";
xmlns:lenya="http://apache.org/cocoon/lenya/page-envelope/1.0";>
<head>
<title>Doco</title>
</head>
<body>
<h1>Welcome to doco</h1>
- <p>This publication is created with the aim to be a generic documentation
- publication for Apache wide usage.</p>
- <p>The first projects to test it are the Apache Forrest and the Apache
- Lenya project.</p>
- <p>The idea is to manage the content via the Apache Lenya CMS and export
it
- via Apache Forrest.</p>
+ <p>
+ This publication is created with the aim to be a generic documentation
+ publication for Apache wide usage.
+ </p>
+ <p>
+ The first projects to test it are the Apache Forrest and the Apache Lenya
+ project.
+ </p>
+ <p>
+ The idea is to manage the content via the Apache Lenya CMS and export it
+ via Apache Forrest.
+ </p>
<h2>Installing</h2>
- <p>See <a
-
href="https://svn.apache.org/repos/asf/lenya/sandbox/doco/README.txt";>README</a>
- </p>
+ <p>
+ See
+ <a
+
href="https://svn.apache.org/repos/asf/lenya/sandbox/doco/README.txt";>README</a>
+ </p>
</body>
</html>
Modified: forrest/trunk/whiteboard/doco/content/authoring/index/index_en.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/doco/content/authoring/index/index_en.xml?view=diff&rev=526406&r1=526405&r2=526406
==============================================================================
--- forrest/trunk/whiteboard/doco/content/authoring/index/index_en.xml
(original)
+++ forrest/trunk/whiteboard/doco/content/authoring/index/index_en.xml Sat Apr
7 01:35:39 2007
@@ -21,16 +21,20 @@
</head>
<body>
<h1>Default Publication</h1>
- <p>Welcome to the default Lenya publication!</p>
- <p>The purpose of this publication is</p>
+ <p>
+ Welcome to the default Lenya publication!
+ </p>
+ <p>
+ The purpose of this publication is
+ </p>
<ul>
<li>to show beginners the basic functionality of the Lenya CMS,</li>
<li>to provide an "out of the box" publication that can be easily
adapted and used, and</li>
<li>to provide a basis for reference implementations of new concepts and
best practices.</li>
</ul>
<p>
- You won't find any fancy and confusing bells and whistles here, but the
- publication contains everything you need to get started.
+ You won't find any fancy and confusing bells and whistles here, but the
+ publication contains everything you need to get started.
</p>
</body>
</html>
Modified:
forrest/trunk/whiteboard/doco/content/authoring/index/xdoc/index_en.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/doco/content/authoring/index/xdoc/index_en.xml?view=diff&rev=526406&r1=526405&r2=526406
==============================================================================
--- forrest/trunk/whiteboard/doco/content/authoring/index/xdoc/index_en.xml
(original)
+++ forrest/trunk/whiteboard/doco/content/authoring/index/xdoc/index_en.xml Sat
Apr 7 01:35:39 2007
@@ -15,250 +15,246 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-<document>
- <header>
- <title>The Apache Forrest xdocs document-v2.0 DTD</title>
+<document>
+ <header>
+ <title>The Apache Forrest xdocs document-v2.0 DTD</title>
<notice>The content of this document doesn't make any sense at
all.</notice>
- <abstract>This is a demonstration document using all possible elements in
- the current Apache Forrest xdocs <code>document-v20.dtd</code>
- </abstract>
- </header>
- <body>
- <note>text xxx</note>
- <note>
+ <abstract>
This is a demonstration document using all possible elements in the
current Apache Forrest xdocs <code>document-v20.dtd</code>
- (See the <a href="#changes">DTD changes</a> section at the bottom.)
+ </abstract>
+ </header>
+ <body>
+ <note>
+ text xxx
+ </note>
+ <note>
+ This is a demonstration document using all possible elements in the
+ current Apache Forrest xdocs <code>document-v20.dtd</code> (See the
+ <a href="#changes">DTD changes</a> section at the bottom.)
</note>
<section id="sample">
<title>Sample Content</title>
<p>
-<strong>Hint:</strong> See the xml source to see how the various xxx
- elements are used and see the
-
- <a href="http://forrest.apache.org/docs/dtd-docs.html";>DTD reference
documentation</a>.
+ <strong>Hint:</strong> See the xml source to see how the various xxx
+ elements are used and see the
+ <a href="http://forrest.apache.org/docs/dtd-docs.html";>DTD reference
+ documentation</a>.
</p>
<section id="block-inline">
<title>Block and inline elements</title>
- <p>This is a simple paragraph. Most documents contain a fair amount of
- paragraphs. Paragraphs are called <code><p></code>.</p>
- <p>
- This next paragraph has a class attribute of 'quote'. CSS
can
- be used to present this <code><p class='quote'></code>
in
- a different style than the other paragraphs. The handling of
- this quoted paragraph is defined in the <extra-css>
- element in the skinconf.xml.
- </p>
- <p>
- Anyway, like I was sayin', shrimp is the fruit of the sea. You can
- barbecue it, boil it, broil it, bake it, sautee it. Dey's uh,
- shrimp-kabobs, shrimp creole, shrimp gumbo. Pan fried, deep fried,
- stir-fried. There's pineapple shrimp, lemon shrimp, coconut
shrimp,
- pepper shrimp, shrimp soup, shrimp stew, shrimp salad, shrimp and
- potatoes, shrimp burger, shrimp sandwich. That- that's about it.
- </p>
- <p>A number of in-line elements are available in the DTD, we will show
them
- inside an unordered list (<code><ul></code>):</p>
- <ul>
- <li>Here is a simple list item (<code><li></code>).</li>
- <li>Have you seen the use of the <code><code></code> element in
the
- previous item?</li>
- <li>Also, we have <code><sub></code> and <code><sup></code>
+ <p>
+ This is a simple paragraph. Most documents contain a fair amount of
+ paragraphs. Paragraphs are called <code><p></code>.
+ </p>
+ <p>
+ This next paragraph has a class attribute of 'quote'. CSS
+ can be used to present this <code><p
+ class='quote'></code> in a different style than the
other
+ paragraphs. The handling of this quoted paragraph is defined in the
+ <extra-css> element in the skinconf.xml.
+ </p>
+ <p>
+ Anyway, like I was sayin', shrimp is the fruit of the sea. You
+ can barbecue it, boil it, broil it, bake it, sautee it. Dey's
uh,
+ shrimp-kabobs, shrimp creole, shrimp gumbo. Pan fried, deep fried,
+ stir-fried. There's pineapple shrimp, lemon shrimp, coconut
+ shrimp, pepper shrimp, shrimp soup, shrimp stew, shrimp salad, shrimp
+ and potatoes, shrimp burger, shrimp sandwich. That- that's about
+ it.
+ </p>
+ <p>
+ A number of in-line elements are available in the DTD, we will show
+ them inside an unordered list (<code><ul></code>):
+ </p>
+ <ul>
+ <li>Here is a simple list item (<code><li></code>).</li>
+ <li>Have you seen the use of the <code><code></code> element
in the
+ previous item?</li>
+ <li>Also, we have <code><sub></code> and
<code><sup></code>
elements to show content <sup>above</sup> or <sub>below</sub> the
text
- baseline.</li>
- <li>There is a facility to <em>emphasize</em> certain words using the
- <code><em></code> <strong>
-<code><strong></code>
-</strong>
- elements.</li>
- <li>We can use
- <icon alt="feather" height="22" src="../images/icon.png" width="26"
/>
- <code><icon></code>s too.</li>
- <li>Another possibility is the <code><img></code> element:
+ baseline.</li>
+ <li>There is a facility to <em>emphasize</em> certain words using the
+ <code><em></code><strong><code><strong></code></strong>
+ elements.</li>
+ <li>We can use
+ <icon alt="feather" height="22" src="../images/icon.png" width="26"
/><code><icon></code>s too.</li>
+ <li>Another possibility is the <code><img></code> element:
<img alt="another feather" height="22" src="../images/icon.png"
width="26" />,
- which offers the ability to refer to an image map.</li>
- <li>We have elements for hyperlinking:
- <dl>
- <dt>
-<code><a href="faq.html"></code>
-</dt>
- <dd>Use this to
+ which offers the ability to refer to an image map.</li>
+ <li>We have elements for hyperlinking:
+ <dl>
+ <dt><code><a href="faq.html"></code></dt>
+ <dd>Use this to
<a href="faq.html" title="Example of a document via
link">link</a>
to another document. As per normal, this will open the new
document
- in the same browser window.</dd>
-
- <dt>
-<code><a href="#section"></code>
-</dt>
- <dd>Use this to
+ in the same browser window.</dd>
+ <dt><code><a href="#section"></code></dt>
+ <dd>Use this to
<a href="#section" title="Example of a document via local
anchor">link</a>
to the named anchor in the current document.
- </dd>
-
- <dt>
-<code><a href="faq.html#forrest"></code>
-</dt>
- <dd>Use this to
+ </dd>
+ <dt><code><a href="faq.html#forrest"></code></dt>
+ <dd>Use this to
<a href="faq.html#forrest" title="Example of a document via link
and anchor">link</a>
to another document and go to the named anchor. This will open
the new document in the same browser window.
- </dd>
- <dt>Targetted window control with jump and fork.</dt>
- <dd>See demonstration
+ </dd>
+ <dt>Targetted window control with jump and fork.</dt>
+ <dd>See demonstration
<a href="#link-class">using class attribute on links</a>.
- </dd>
- </dl>
-</li>
-
- <li>Oh, by the way, a definition list <code><dl></code> was used
inside
+ </dd>
+ </dl></li>
+ <li>Oh, by the way, a definition list <code><dl></code> was
used inside
the previous list item. We could put another
- <ul>
- <li>unordered list</li>
- <li>inside the list item</li>
- </ul>
- <table>
- <caption>A sample nested table</caption>
- <tr>
-<td colspan="1" rowspan="1">Or even tables.. </td>
-<td colspan="1" rowspan="1">
- <table>
-<tr>
-<td colspan="1" rowspan="1">inside tables..</td>
-</tr>
-</table>
- </td>
-</tr>
- <tr>
-<td colspan="1" rowspan="1">or inside lists, but I believe this liberty gets
quickly quite
+ <ul>
+ <li>unordered list</li>
+ <li>inside the list item</li>
+ </ul>
+ <table>
+ <caption>A sample nested table</caption>
+ <tr>
+ <td colspan="1" rowspan="1">Or even tables.. </td>
+ <td colspan="1" rowspan="1">
+ <table>
+ <tr>
+ <td colspan="1" rowspan="1">inside tables..</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="1" rowspan="1">or inside lists, but I believe
this liberty gets quickly quite
hairy as you see.</td>
-</tr>
- </table>
- </li>
- </ul>
- <p>So far for the in-line elements, let's look at some
paragraph-level
- elements.</p>
- <fixme author="SN">The <code><fixme></code> element is used for
stuff
- which still needs work. Mind the <code>author</code>
attribute!</fixme>
- <note>Use the <code><note></code> element to draw attention to
something, e.g. ...The <code><code></code> element is used when the
author can't
- express himself clearly using normal sentences ;-)</note>
- <warning>Sleep deprivation can be the result of being involved in an open
- source project. (a.k.a. the <code><warning></code> element).
- </warning>
- <note label="Important">If you want your own labels for notes and
- warnings, specify them using the <code>label</code> attribute.
- </note>
- <p>Apart from unordered lists, we have ordered lists too, of course.</p>
- <ol>
- <li>Item 1</li>
- <li>Item 2</li>
- <li>This should be 3 if my math is still OK.</li>
- </ol>
+ </tr>
+ </table></li>
+ </ul>
+ <p>
+ So far for the in-line elements, let's look at some
+ paragraph-level elements.
+ </p>
+ <fixme author="SN">
+ The <code><fixme></code> element is used for stuff which still
+ needs work. Mind the <code>author</code> attribute!
+ </fixme>
+ <note>
+ Use the <code><note></code> element to draw attention to
+ something, e.g. ...The <code><code></code> element is used when
+ the author can't express himself clearly using normal sentences
+ ;-)
+ </note>
+ <warning>
+ Sleep deprivation can be the result of being involved in an open
+ source project. (a.k.a. the <code><warning></code> element).
+ </warning>
+ <note label="Important">
+ If you want your own labels for notes and warnings, specify them
using
+ the <code>label</code> attribute.
+ </note>
+ <p>
+ Apart from unordered lists, we have ordered lists too, of course.
+ </p>
+ <ol>
+ <li>Item 1</li>
+ <li>Item 2</li>
+ <li>This should be 3 if my math is still OK.</li>
+ </ol>
</section>
-
<section id="presentations">
<title>Various presentation formats</title>
-
- <p>This sample document, written in document-v20 XML can be presented
- via Forrest in a number of different formats. The links in the
- following list show this document in each of the currently available
- formats.</p>
-
- <p>Each of the formats can be made available as a link near the top of
- the page. Actual placement of those links depends on the skin
- currently in use. Those links are enabled in the skinconf.xml via the
- <disable-XXX-link> elements in the skinconf.xml</p>
-
+ <p>
+ This sample document, written in document-v20 XML can be presented
via
+ Forrest in a number of different formats. The links in the following
+ list show this document in each of the currently available formats.
+ </p>
+ <p>
+ Each of the formats can be made available as a link near the top of
+ the page. Actual placement of those links depends on the skin
+ currently in use. Those links are enabled in the skinconf.xml via the
+ <disable-XXX-link> elements in the skinconf.xml
+ </p>
<table>
<tr>
<th colspan="1" rowspan="1">Presentation Format</th>
-
<th colspan="1" rowspan="1">Description</th>
-
<th colspan="1" rowspan="1">skinconf.xml Element</th>
</tr>
-
<tr>
- <td colspan="1" rowspan="1">
-<a href="sample.html">HTML</a>
-</td>
-
+ <td colspan="1" rowspan="1"><a href="sample.html">HTML</a>
+ </td>
<td colspan="1" rowspan="1">This document in HTML format. </td>
-
<td colspan="1" rowspan="1">Always generated by default. Cannot be
turned off.</td>
</tr>
-
<tr>
- <td colspan="1" rowspan="1">
-<a href="sample.xml">XML</a>
-</td>
-
+ <td colspan="1" rowspan="1"><a href="sample.xml">XML</a>
+ </td>
<td colspan="1" rowspan="1">This document in its raw XML
format.</td>
-
<td colspan="1" rowspan="1"><disable-xml-link>. By default,
set to true, meaning
that this link will not be shown.</td>
</tr>
-
<tr>
- <td colspan="1" rowspan="1">
-<a href="sample.pdf">PDF</a>
-</td>
-
+ <td colspan="1" rowspan="1"><a href="sample.pdf">PDF</a>
+ </td>
<td colspan="1" rowspan="1">This document as Adobe PDF</td>
-
<td colspan="1" rowspan="1"><disable-pdf-link>. By default,
set to false, meaning
that this link will be shown.</td>
</tr>
-
<tr>
<td colspan="1" rowspan="1">Text</td>
-
<td colspan="1" rowspan="1">
-<p>This document as straight text.</p>
- <p>For additional information see the Forrest text-output
- plugin.</p>
-</td>
-
+ <p>
+ This document as straight text.
+ </p>
+ <p>
+ For additional information see the Forrest text-output plugin.
+ </p>
+ </td>
<td colspan="1" rowspan="1"><disable-txt-link>. By default,
set to true, meaning
that this link will not be shown.</td>
</tr>
-
<tr>
<td colspan="1" rowspan="1">POD</td>
-
<td colspan="1" rowspan="1">
-<p>This document as Perl POD (Plain Old Documentation). Text
- with minimal formatting directives. If on a *nix system with perl
- installed, see "man perlpod".</p>
- <p>For additional information see the Forrest pod-output
- plugin.</p>
-</td>
-
+ <p>
+ This document as Perl POD (Plain Old Documentation). Text with
+ minimal formatting directives. If on a *nix system with perl
+ installed, see "man perlpod".
+ </p>
+ <p>
+ For additional information see the Forrest pod-output plugin.
+ </p>
+ </td>
<td colspan="1" rowspan="1"><disable-pod-link>. By default,
set to true, meaning
that this link will not be shown.</td>
</tr>
</table>
</section>
- <section id="section">
+ <section id="section">
<title>Using sections</title>
- <p>You can use sections to put some structure in your document. For
some
+ <p>
+ You can use sections to put some structure in your document. For some
strange historical reason, the section title is an attribute of the
- <code><section></code> element.</p>
- </section>
+ <code><section></code> element.
+ </p>
+ </section>
<section id="sub-section">
<title>Sections, the sequel</title>
- <p>Just some second section.</p>
+ <p>
+ Just some second section.
+ </p>
<section id="sub-sub-section">
<title>Section 2.1</title>
- <p>Which contains a subsection (2.1).</p>
- </section>
- </section>
-
+ <p>
+ Which contains a subsection (2.1).
+ </p>
+ </section>
+ </section>
<section id="source">
- <title>Showing preformatted source code</title>
- <p>Enough about these sections. Let's have a look at more
interesting
- elements, <code><source></code> for instance:</p>
+ <title>Showing preformatted source code</title>
+ <p>
+ Enough about these sections. Let's have a look at more
+ interesting elements, <code><source></code> for instance:
+ </p>
<source>
// This example is from the book _Java in a Nutshell_ by David Flanagan.
// Written by David Flanagan. Copyright (c) 1996 O'Reilly &
Associates.
@@ -275,23 +271,26 @@
g.drawString("Hello World", 25, 50);
}
}</source>
- <p>CDATA sections are used within
- <code><source></code> elements so that you can write pointy
- brackets without needing to escape them with messy
- <code>&lt;</code> entities ...
- </p>
+ <p>
+ CDATA sections are used within <code><source></code> elements
so
+ that you can write pointy brackets without needing to escape them
with
+ messy <code>&lt;</code> entities ...
+ </p>
<source>
<pointy>
easy
</pointy>
</source>
- <p>Please take care to still use a sensible line-length within your
- source elements.</p>
+ <p>
+ Please take care to still use a sensible line-length within your
+ source elements.
+ </p>
</section>
-
<section id="table">
<title>Using tables</title>
- <p>And now for a table:</p>
+ <p>
+ And now for a table:
+ </p>
<table>
<caption>Table caption</caption>
<tr>
@@ -312,7 +311,7 @@
<tr>
<th colspan="1" rowspan="1">column 1</th>
<th colspan="1" rowspan="1">column 2</th>
- </tr>
+ </tr>
<tr>
<td colspan="1" rowspan="1">cell A</td>
<td colspan="1" rowspan="1">cell B</td>
@@ -321,82 +320,82 @@
</td>
<td colspan="1" rowspan="1">
<ul>
-<li>and can include most other elements</li>
-<li>such as lists</li>
-</ul>
+ <li>and can include most other elements</li>
+ <li>such as lists</li>
+ </ul>
</td>
</tr>
- </table>
+ </table>
</section>
-
<anchor id="second-figure-anchor" />
- <section id="figure">
+ <section id="figure">
<title>Using figures</title>
- <p>And a <code><figure></code> to end all of this.
- Note that this can also be implemented with an
- <code><img></code> element.
+ <p>
+ And a <code><figure></code> to end all of this. Note that this
+ can also be implemented with an <code><img></code> element.
</p>
- <figure alt="The fine Forrest logo" height="65"
src="../images/project.png" width="220" />
+ <figure alt="The fine Forrest logo" height="65"
src="../images/project.png" width="220" />
</section>
<section id="link-class">
<title>Using class attribute on links</title>
-
- <p>The document-v13 had elements <fork> and <jump>. In
- document-v20, those elements no longer exist but the functionality can
- be duplicated by using the @class attribute.
- Even though the opening of separate windows should be under the
- control of the user, these techniques can still be employed.</p>
-
+ <p>
+ The document-v13 had elements <fork> and <jump>. In
+ document-v20, those elements no longer exist but the functionality
can
+ be duplicated by using the @class attribute. Even though the opening
+ of separate windows should be under the control of the user, these
+ techniques can still be employed.
+ </p>
<table>
<tr>
<th colspan="1" rowspan="1">
-<p>Document V1.3</p>
-</th>
-
+ <p>
+ Document V1.3
+ </p>
+ </th>
<th colspan="1" rowspan="1">
-<p>Document V2.0</p>
-</th>
+ <p>
+ Document V2.0
+ </p>
+ </th>
</tr>
-
<tr>
<td colspan="1" rowspan="1">
-<p><fork href="faq.html"></p>
-</td>
-
- <td colspan="1" rowspan="1">
-<a href="faq.html"><a class="fork"
+ <p>
+ <fork href="faq.html">
+ </p>
+ </td>
+ <td colspan="1" rowspan="1"><a href="faq.html"><a
class="fork"
href="faq.html"></a>
-</td>
+ </td>
</tr>
-
<tr>
<td colspan="1" rowspan="1">
-<p><jump href="faq.html"></p>
-</td>
-
+ <p>
+ <jump href="faq.html">
+ </p>
+ </td>
<td colspan="1" rowspan="1">
-<p>
-<a href="faq.html"><a class="jump"
- href="faq.html"></a>
-</p>
-</td>
+ <p>
+ <a href="faq.html"><a class="jump"
+ href="faq.html"></a>
+ </p>
+ </td>
</tr>
</table>
</section>
</section>
-
<section id="changes">
<title>DTD changes</title>
- <p>See the generated
-
- <a href="http://forrest.apache.org/docs/dtd-docs.html";>DTD reference
documentation</a>.
+ <p>
+ See the generated
+ <a href="http://forrest.apache.org/docs/dtd-docs.html";>DTD reference
+ documentation</a>.
</p>
<section id="changes-20">
<title>Changes between document-v13 and document-v20</title>
<ul>
<li>Renamed <strong><link></strong>
- to <strong><a></strong>
- </li>
+ to <strong><a></strong></li>
<li>Removed <strong><fork></strong>
and <strong><jump></strong> in favour of the
<strong><a></strong> element. See demonstration
@@ -440,8 +439,8 @@
</ul>
</section>
</section>
- </body>
- <footer>
- <!--<legal>This is a legal notice, so it is.</legal>-->
+ </body>
+ <footer>
+<!--<legal>This is a legal notice, so it is.</legal>-->
</footer>
</document>
Modified: forrest/trunk/whiteboard/doco/content/authoring/tabs.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/doco/content/authoring/tabs.xml?view=diff&rev=526406&r1=526405&r2=526406
==============================================================================
--- forrest/trunk/whiteboard/doco/content/authoring/tabs.xml (original)
+++ forrest/trunk/whiteboard/doco/content/authoring/tabs.xml Sat Apr 7
01:35:39 2007
@@ -16,13 +16,11 @@
limitations under the License.
-->
<!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN"
"http://forrest.apache.org/dtd/tab-cocoon-v11.dtd";>
-
<tabs software="MyProj"
title="MyProj"
copyright="Foo"
xmlns:xlink="http://www.w3.org/1999/xlink";>
-
- <!-- The rules for tabs are:
+<!-- The rules for tabs are:
@dir will always have '/@indexfile' added.
@indexfile gets appended to @dir if the tab is selected. Defaults to
'index.html'
@href is not modified unless it is root-relative and obviously specifies a
@@ -32,11 +30,9 @@
Tabs can be embedded to a depth of two. The second level of tabs will only
be displayed when their parent tab is selected.
-->
-
<tab id="home" label="Home" dir="" indexfile="index.html"/>
- <!-- Add new tabs here, eg:
+<!-- Add new tabs here, eg:
<tab label="How-Tos" dir="community/howto/"/>
<tab label="XML Site" dir="xml-site/"/>
-->
-
</tabs>
Modified: forrest/trunk/whiteboard/doco/content/locationmap.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/doco/content/locationmap.xml?view=diff&rev=526406&r1=526405&r2=526406
==============================================================================
--- forrest/trunk/whiteboard/doco/content/locationmap.xml (original)
+++ forrest/trunk/whiteboard/doco/content/locationmap.xml Sat Apr 7 01:35:39
2007
@@ -15,19 +15,16 @@
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>
</components>
-
- <locator>
+ <locator>
<match pattern="project.xml.site">
<location src="cocoon://doco-site.xml"/>
</match>
</locator>
-</locationmap>
\ No newline at end of file
+</locationmap>
Modified: forrest/trunk/whiteboard/doco/content/trash/sitetree.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/doco/content/trash/sitetree.xml?view=diff&rev=526406&r1=526405&r2=526406
==============================================================================
--- forrest/trunk/whiteboard/doco/content/trash/sitetree.xml (original)
+++ forrest/trunk/whiteboard/doco/content/trash/sitetree.xml Sat Apr 7
01:35:39 2007
@@ -15,5 +15,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<site xmlns="http://apache.org/cocoon/lenya/sitetree/1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://apache.org/cocoon/lenya/sitetree/1.0
../../../../resources/entities/sitetree.xsd">
-</site>
+<site xmlns="http://apache.org/cocoon/lenya/sitetree/1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://apache.org/cocoon/lenya/sitetree/1.0
../../../../resources/entities/sitetree.xsd"></site>
Modified:
forrest/trunk/whiteboard/doco/resources/structurer/resource-types/xhtml.fv
URL:
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/doco/resources/structurer/resource-types/xhtml.fv?view=diff&rev=526406&r1=526405&r2=526406
==============================================================================
--- forrest/trunk/whiteboard/doco/resources/structurer/resource-types/xhtml.fv
(original)
+++ forrest/trunk/whiteboard/doco/resources/structurer/resource-types/xhtml.fv
Sat Apr 7 01:35:39 2007
@@ -15,23 +15,22 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<forrest:views
xmlns:forrest="http://apache.org/forrest/templates/1.0";
xmlns:jx="http://apache.org/cocoon/templates/jx/1.0";>
- <!-- The following variables are used to contact data models and/or
contracts. -->
+<!-- The following variables are used to contact data models and/or contracts.
-->
<jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}"/>
<jx:set var="getRequestExtension"
value="#{$cocoon/parameters/getRequestExtension}" />
<forrest:view type="html" hooksXpath="/html/body">
- <!--
+<!--
@type defines this structurer to html.
@hooksXpath defines where all hooks will be injected (as prefix).
-->
<forrest:contract name="branding-css-links">
- <!-- More information around this contract
+<!-- More information around this contract
http://marc.theaimsgroup.com/?l=forrest-dev&m=113473237805195&w=2
-->
- <!--Note: The forrest:properties element does not exit anymore (in
comparison to a previous versions) -->
+<!--Note: The forrest:properties element does not exit anymore (in comparison
to a previous versions) -->
<forrest:property name="branding-css-links-input">
<css url="common.css"/>
<css>
@@ -44,7 +43,7 @@
<meta http-equiv="content-type" content="text/html, charset=UTF-8"/>
</forrest:property>
</forrest:contract>
- <!--
+<!--
nuggets (extra data requested by the contract) are now defined in the
contract element.
As well the former @nugget is now called @dataURI to reflect better
the function of the attribute.
-->
@@ -66,8 +65,7 @@
<forrest:hook name="page">
<forrest:hook name="leftbar">
<forrest:contract name="nav-section"
- dataURI="cocoon://#{$getRequest}.navigation.xml">
- </forrest:contract>
+
dataURI="cocoon://#{$getRequest}.navigation.xml"></forrest:contract>
</forrest:hook>
<forrest:hook name="content">
<forrest:hook name="content-main">
@@ -87,6 +85,5 @@
<forrest:contract name="siteinfo-last-published"/>
</forrest:hook>
</forrest:hook>
-
</forrest:view>
</forrest:views>
