db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r390204 [8/8] - in /db/derby/site/trunk: build/site/ build/site/integrate/ build/site/integrate/plugin_help/ build/site/manuals/ build/site/papers/ build/site/papers/DerbyTut/ build/site/releases/ build/site/skin/ build/site/skin/images/ sr...
Date Thu, 30 Mar 2006 18:21:56 GMT
Modified: db/derby/site/trunk/src/documentation/content/xdocs/manuals/index.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/manuals/index.xml?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/manuals/index.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/manuals/index.xml Thu Mar 30 10:21:49
2006
@@ -2,7 +2,7 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document> 
   <header> 
-    <title>Apache Derby: Manuals</title> 
+    <title>Apache Derby: Documentation</title> 
   </header> 
   <body> 
 
@@ -10,35 +10,35 @@
   <title>Descriptions</title>
 
 <p>
-A link to each manual in PDF and HTML format is available on the menu
-to the left. 
+The Derby documentation is available on-online.
 A description of each manual is below:
 </p>
 
 <ul>
-   <li><p>The <em>Getting Started</em> guide introduces Derby
-       and is intended for new users.
+   <li><p><em>Getting Started with Derby</em>: 
+       introduces Derby to new users.
        </p>
    </li>
-   <li><p>The <em>Reference Manual</em> provides reference information,
+   <li><p><em>Derby Reference Manual</em>:
+        provides reference information,
         including SQL syntax and descriptions of the system catalogs.
    </p></li>
-   <li><p>The <em>Developer's Guide</em>
+   <li><p><em>Derby Developer's Guide</em>:
        describes how to use JDBC to access Derby databases.
        It is intended for developers building Derby applications.
        </p>
    </li>
-   <li><p>The <em>Tuning Derby</em> guide explains how to set
-     properties to configure and tune Derby. It also provides performance
-     tuning tips.
+   <li><p><em>Tuning Derby</em>: 
+     explains how to set properties to configure and tune Derby. 
+     It also provides performance tuning tips.
    </p>
    </li>
-   <li><p>The <em>Server and Administration</em> guide
+   <li><p><em>Derby Server and Administration Guide</em>:
       describes how to use the Derby Network Server and how
       to perform administrative tasks such as backing up databases.
       </p>
    </li>
-   <li><p>The <em>Tools and Utilities</em> guide explains the
+   <li><p>The <em>Derby Tools and Utilities Guide</em> explains the
       ins and outs of
      <code>ij</code>,
      <code>dblook</code> and
@@ -49,20 +49,85 @@
 </ul>
 </section>
 
+<section id="latest">
+  <title>Latest Alpha Manuals</title>
+    <p>The latest development version of the manuals,  corresponding to the
+Derby alpha codeline, are listed in this section.
+    </p>
 
-<section>
-  <title>10.0 Manuals</title>
-
-<p>
-The 10.0 manuals are the files
-that were originally contributed to Apache.
-Before reporting a problem in one of these manuals, please check
-to see if the problem still exists in the 10.1 manuals.
-</p>
+  <table>
+     <tr>
+        <th colspan="2">English</th>
+     </tr>
+     <tr>
+        <td>API</td>
+        <td><a class="fork" href="http://db.apache.org/derby/javadoc/publishedapi/">HTML</a></td>
+     </tr>
+     <tr>
+        <td><em>Getting Started with Derby</em></td>
+        <td> [<a class="fork" href="http://db.apache.org/derby/docs/dev/getstart/getstartderby.pdf">PDF</a>]
+             [<a class="fork" href="http://db.apache.org/derby/docs/dev/getstart/getstart-single.html">HTML
Book</a>]
+             [<a class="fork" href="http://db.apache.org/derby/docs/dev/getstart/">HTML
Pages</a>]
+        </td>
+     </tr>
+     <tr>
+        <td><em>Derby Reference Manual</em></td>
+        <td>[<a class="fork" href="http://db.apache.org/derby/docs/dev/ref/refderby.pdf">PDF</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/dev/ref/ref-single.html">HTML
Book</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/dev/ref/">HTML Pages</a>]
+        </td>
+     </tr>
+     <tr>
+        <td><em>Derby Developer's Guide</em></td>
+        <td>[<a class="fork" href="http://db.apache.org/derby/docs/dev/devguide/derbydev.pdf">PDF</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/dev/devguide/devguide-single.html">HTML
Book</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/dev/devguide/">HTML
Pages</a>]
+        </td>
+     </tr>
+     <tr>
+        <td><em>Tuning Derby</em></td>
+        <td>[<a class="fork" href="http://db.apache.org/derby/docs/dev/tuning/tuningderby.pdf">PDF</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/dev/tuning/tuning-single.html">HTML
Book</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/dev/tuning/">HTML
Pages</a>]
+        </td>
+     </tr>
+     <tr>
+        <td><em>Derby Server and Administration Guide</em></td>
+        <td>[<a class="fork" href="http://db.apache.org/derby/docs/dev/adminguide/derbyadmin.pdf">PDF</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/dev/adminguide/adminguide-single.html">HTML
Book</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/dev/adminguide/">HTML
Pages</a>]
+        </td>
+     </tr>
+     <tr>
+        <td><em>Derby Tools and Utilities Guide</em></td>
+        <td>[<a class="fork" href="http://db.apache.org/derby/docs/dev/tools/derbytools.pdf">PDF</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/dev/tools/tools-single.html">HTML
Book</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/dev/tools/">HTML
Pages</a>]
+        </td>
+     </tr>
+     <tr>
+        <th colspan="2">Brazilian Portuguese</th>
+     </tr>
+     <tr>
+        <td><em>Introdu&#231;&#227;o ao Derby</em></td>
+        <td> [<a class="fork" href="http://db.apache.org/derby/docs/dev/pt_BR/getstart/getstartderby.pdf">PDF</a>]
+             [<a class="fork" href="http://db.apache.org/derby/docs/dev/pt_BR/getstart/pt_BR/getstart-single.html">HTML
Livro</a>]
+             [<a class="fork" href="http://db.apache.org/derby/docs/dev/pt_BR/getstart/">HTML
P&#225;ginas</a>]
+        </td>
+     </tr>
+     <tr>
+        <td><em>Manual de Refer&#234;ncia do Derby</em></td>
+        <td>[<a class="fork" href="http://db.apache.org/derby/docs/dev/pt_BR/ref/refderby.pdf">PDF</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/dev/pt_BR/ref/pt_BR/ref-single.html">HTML
Livro</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/dev/pt_BR/ref/">HTML
P&#225;ginas</a>]
+        </td>
+     </tr>
+     </table>
 
 </section>
 
-<section>
+
+<section id="docs_10.1">
   <title>10.1 Manuals</title>
 <p>
 Derby adopted the Darwin Information Typing Architecture (DITA) XML
@@ -73,17 +138,127 @@
 <a href="../derby_mail.html">Derby mail list</a>
 discussions about format.
 </p>
+
+  <table>
+     <tr>
+        <th colspan="2">English</th>
+     </tr>
+     <tr>
+        <td>API</td>
+        <td><a class="fork" href="http://db.apache.org/derby/docs/10.1/publishedapi/">HTML</a></td>
+     </tr>
+     <tr>
+        <td><em>Getting Started with Derby</em></td>
+        <td> [<a class="fork" href="http://db.apache.org/derby/docs/10.1/getstart/getstartderby.pdf">PDF</a>]
+             [<a class="fork" href="http://db.apache.org/derby/docs/10.1/getstart/getstart-single.html">HTML
Book</a>]
+             [<a class="fork" href="http://db.apache.org/derby/docs/10.1/getstart/">HTML
Pages</a>]
+        </td>
+     </tr>
+     <tr>
+        <td><em>Derby Reference Manual</em></td>
+        <td>[<a class="fork" href="http://db.apache.org/derby/docs/10.1/ref/refderby.pdf">PDF</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/10.1/ref/ref-single.html">HTML
Book</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/10.1/ref/">HTML
Pages</a>]
+        </td>
+     </tr>
+     <tr>
+        <td><em>Derby Developer's Guide</em></td>
+        <td>[<a class="fork" href="http://db.apache.org/derby/docs/10.1/devguide/derbydev.pdf">PDF</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/10.1/devguide/devguide-single.html">HTML
Book</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/10.1/devguide/">HTML
Pages</a>]
+        </td>
+     </tr>
+     <tr>
+        <td><em>Tuning Derby</em></td>
+        <td>[<a class="fork" href="http://db.apache.org/derby/docs/10.1/tuning/tuningderby.pdf">PDF</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/10.1/tuning/tuning-single.html">HTML
Book</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/10.1/tuning/">HTML
Pages</a>]
+        </td>
+     </tr>
+     <tr>
+        <td><em>Derby Server and Administration Guide</em></td>
+        <td>[<a class="fork" href="http://db.apache.org/derby/docs/10.1/adminguide/derbyadmin.pdf">PDF</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/10.1/adminguide/adminguide-single.html">HTML
Book</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/10.1/adminguide/">HTML
Pages</a>]
+        </td>
+     </tr>
+     <tr>
+        <td><em>Derby Tools and Utilities Guide</em></td>
+        <td>[<a class="fork" href="http://db.apache.org/derby/docs/10.1/tools/derbytools.pdf">PDF</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/10.1/tools/tools-single.html">HTML
Book</a>]
+            [<a class="fork" href="http://db.apache.org/derby/docs/10.1/tools/">HTML
Pages</a>]
+        </td>
+     </tr>
+</table>
+
 </section>
 
-<section>
-  <title>Latest Alpha Manuals</title>
-    <p>The latest development version of the manuals which corresponds
-       to the current alpha release reside in this section. The current
-       alpha version is Derby 10.2.
-    </p>
+<section id="docs_10.0">
+  <title>10.0 Manuals</title>
+
+<p>
+The 10.0 manuals are the files
+that were originally contributed to Apache.
+Before reporting a problem in one of these manuals, please check
+to see if the problem still exists in the 10.1 manuals.
+</p>
+
+  <table>
+     <tr>
+        <th colspan="2">English</th>
+     </tr>
+     <tr>
+        <td>API</td>
+        <td><a class="fork" href="http://db.apache.org/derby/docs/10.0/publishedapi/">HTML</a></td>
+     </tr>
+     <tr>
+        <td>All docs </td>
+        <td>
+          [<a href="http://db.apache.org/derby/docs/docs-10.0.zip">zip</a>]
+          [<a href="http://db.apache.org/derby/docs/docs-10.0.tar.gz">tar.gz</a>]
+        </td>
+     </tr>
+     <tr>
+        <td><em>Getting Started with Derby</em></td>
+        <td> 
+             [<a class="fork" href="http://db.apache.org/derby/docs/10.0/manuals/getstart/gspr02.html">HTML
Pages</a>]
+        </td>
+     </tr>
+     <tr>
+        <td><em>Derby Reference Manual</em></td>
+        <td>
+            [<a class="fork" href="http://db.apache.org/derby/docs/10.0/manuals/reference/sqlj02.html">HTML
Pages</a>]
+        </td>
+     </tr>
+     <tr>
+        <td><em>Derby Developer's Guide</em></td>
+        <td>
+            [<a class="fork" href="http://db.apache.org/derby/docs/10.0/manuals/develop/develop02.html">HTML
Pages</a>]
+        </td>
+     </tr>
+     <tr>
+        <td><em>Tuning Derby</em></td>
+        <td>
+            [<a class="fork" href="http://db.apache.org/derby/docs/10.0/manuals/tuning/perf02.html">HTML
Pages</a>]
+        </td>
+     </tr>
+     <tr>
+        <td><em>Derby Server and Administration Guide</em></td>
+        <td>
+            [<a class="fork" href="http://db.apache.org/derby/docs/10.0/manuals/admin/hubprnt02.html">HTML
Pages</a>]
+        </td>
+     </tr>
+     <tr>
+        <td><em>Derby Tools and Utilities Guide</em></td>
+        <td>
+            [<a class="fork" href="http://db.apache.org/derby/docs/10.0/manuals/tools/tools02.html">HTML
Pages</a>]
+        </td>
+     </tr>
+</table>
 </section>
 
-<section>
+
+<section id="doc_issues">
   <title>Reporting Documentation Issues</title>
 
 <p>
@@ -93,6 +268,6 @@
 
 </section>
 
-<p><em>Last Updated: June 28, 2005</em></p>
+<p><em>Last Updated: March 30, 2006</em></p>
 </body>
 </document>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/papers/index.xml Thu Mar 30 10:21:49
2006
@@ -2,14 +2,13 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document> 
   <header> 
-    <title>Apache Derby White Papers</title> 
+    <title>Apache Derby Papers</title> 
   </header> 
   <body> 
 
 <p>
-This <em>ad hoc</em> spot in the Derby site hosts white papers.
-The categories in the left-hand navigation bar will grow and
-change as papers get contributed.
+This <em>ad hoc</em> spot in the Derby site hosts papers, and check the
+<a href="http://wiki.apache.org/db-derby/">Derby Wiki</a> for more.
 </p>
 
 <section>
@@ -95,44 +94,15 @@
 
 </section>
 
-
-<section>
-<title>Presentations</title>
-     <ul>
-        <li> <a href="ApacheCon.html">ApacheCon</a> Derby sessions.
-        </li>
-	<li><a href="MiscPresentations.html">OSCON 2005</a>
-             had a Derby BoF and a Derby Tutorial.
-	</li>
-        <li> <a href="MiscPresentations.html">Colorado Software Summit 2004</a>

-             had a Derby internals session.
-	</li>
-     </ul>
-
-</section>
-
 <section>
   <title>Instruction</title>
 
 <p>
-Check out the <a href="DerbyTut/index.html">Derby web site tutorial</a>.
-</p>
-
-<p>
-The rest of the information previously in this section was moved to the
-<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Derby Wiki</a>
-to make it easier for anyone to add new entries.
-</p>
-
-</section>
-
-<section>
-<title>Articles and Books</title>
-
-<p>
-The information in this section was moved to the
-<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Derby Wiki</a>
-to make it easier for anyone to add new entries.
+The online <a href="DerbyTut/index.html">Apache Derby Tutorial</a>
+provides a quick hands-on overview.
+Pointers to
+even more tutorials and other instructional materials are on the
+<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Derby Wiki</a>.
 </p>
 
 </section>
@@ -225,6 +195,6 @@
 
 </section>
 
-<p><em>Last Updated: December 20, 2005</em></p>
+<p><em>Last Updated: March 30, 2005</em></p>
 </body>
 </document>

Added: db/derby/site/trunk/src/documentation/content/xdocs/quick_start.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/quick_start.xml?rev=390204&view=auto
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/quick_start.xml (added)
+++ db/derby/site/trunk/src/documentation/content/xdocs/quick_start.xml Thu Mar 30 10:21:49
2006
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<document> 
+  <header> 
+    <title>Apache Derby: Quick Start</title> 
+  </header> 
+<body> 
+
+<section>
+ <title>The Basics</title>
+
+<p>
+Welcome to Apache Derby!
+The resources listed below are intended for anyone new to Derby:
+</p>
+
+<ul>
+  <li> <a href="derby_downloads.html">Download Derby!</a></li>
+  <li> The <a href="http://db.apache.org/derby/docs/dev/getstart/">Getting 
+       Started</a> guide introduces Derby.  
+  </li>
+  <li> The online <a href="papers/DerbyTut/index.html">Apache Derby 
+       Tutorial</a> provides a quick hands-on overview, 
+       and the 
+       <a href="http://wiki.apache.org/db-derby/DerbyInstruction#Tutorials">Derby
+    Wiki</a> links to even more tutorials.
+  </li>
+  <li> The <a href="faq.html">FAQs</a> page provides answers to common

+       questions.
+   </li>
+  <li> The <a href="derby_mail.html">Derby Users mailing list</a>
+       responds to questions on how to use Derby.
+  </li>
+</ul>
+
+</section>
+
+<section>
+ <title>Next Steps for Users</title>
+<p>
+Once you understand Derby basics, you'll be ready for more.
+Below is a list of resources that explain in greater detail how to use Derby:
+</p>
+
+<ul>
+    <li> <a href="http://wiki.apache.org/db-derby/DerbyInstruction#Examples">Examples</a></li>
+    <li> <a href="http://wiki.apache.org/db-derby/DerbyInstruction#Demos">Demos</a></li>
+
+    <li><a href="integrate/index.html">How to use Derby with other products</a>
+
+     <ul>
+        <li><strong>Database Tools</strong>
+        <ul>
+           <li><a href="integrate/db_ddlutils.html">DdlUtils</a></li>
+        </ul>
+        </li>
+
+        <li><strong>IDEs</strong>
+        <ul>
+           <li><a href="integrate/plugin_howto.html">Eclipse</a> </li>
+           <li><a href="http://www.thecoadletter.com/article/0,1410,33327,00.html">JBuilder</a></li>
+           <li><a href="http://www.netbeans.org/kb/50/derby-demo.html">NetBeans</a></li>
+        </ul>
+        </li>
+
+        <li><strong>Data and Object/Relational Mappers</strong>
+        <ul>
+           <li><a href="integrate/JPetStoreGeronimo.html">iBATIS</a> </li>
+           <li><a href="integrate/JPOX_Derby.html">JPOX JDO</a> </li>
+           <li><a href="integrate/db_torque.html">Torque</a> </li>
+        </ul>
+        </li>
+
+        <li><strong>Web Applications</strong>
+        <ul>
+           <li><a href="integrate/JPetStoreGeronimo.html">Geronimo</a>
</li>
+           <li><a href="papers/fortune_tut.html">Tomcat 5.0</a> </li>
+           <li><a href="integrate/DerbyTomcat5512JPetStor.html">Tomcat 5.5</a></li>
+           <li><a href="integrate/JPetStoreWebSphere.html">WebSphere</a>
</li>
+        </ul>
+        </li>
+     </ul>
+   </li>
+</ul>
+
+<p>
+The <a href="http://wiki.apache.org/db-derby/UsesOfDerby">Derby Wiki</a>
+lists more products that work with Derby.
+As you learn more about Derby, feel free to contribute your own tips to the
+<a href="http://wiki.apache.org/db-derby/UsesOfDerby">Wiki</a>.
+</p>
+
+</section>
+
+<section>
+ <title>Next Steps for Developers</title>
+
+<p>
+The resources listed below are intended for developers who would like
+to contribute to the Derby project:
+</p>
+
+<ul>
+  <li> The <a href="papers/index.html#Derby+Engine">Derby Engine</a> 
+       papers provide internal details about Derby.
+  </li>
+  <li>The <a href="derby_comm.html">Apache Derby: Get Involved!</a> 
+       page includes tips for 
+       <a href="derby_comm.html#Contribute+Code+or+Documentation">contributing
+       code and documentation</a>. 
+  </li>
+  <li> The
+       <a href="http://wiki.apache.org/db-derby/ForNewDevelopers">ForNewDevelopers</a>
+       Derby Wiki page provides guidance for new developers and suggests 
+       starting points.
+  </li>
+  <li> The <a href="derby_mail.html">Derby Developers mailing list</a>
+       hosts development discussions and responds to development questions.
+  </li>
+</ul>
+
+</section>
+
+<p>
+<em>Last updated: 30-March-2006</em>
+</p>
+
+</body>
+</document>

Propchange: db/derby/site/trunk/src/documentation/content/xdocs/quick_start.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/site/trunk/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/site.xml?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/site.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/site.xml Thu Mar 30 10:21:49 2006
@@ -2,96 +2,61 @@
 <site label="Derby" href="" 
   xmlns="http://apache.org/forrest/linkmap/1.0" tab="home">
 
-  <about label="Derby" tab="home">
-    <index     label="Index"   href="index.html"/>
-    <faq       label="FAQs"      href="faq.html"/>
-    <downloads label="Downloads" href="derby_downloads.html"/>
-    <license   label="License"   href="license.html"/>
-    <charter   label="Charter"   href="derby_charter.html"/>
-    <proposal   href="derby_proposal.html"/>
+  <about label="Home" tab="home">
+    <index     label="Apache Derby"   href="index.html"/>
+    <charter   label="Charter"        href="derby_charter.html"/>
+    <qstart    label="Quick Start"    href="quick_start.html"/>
+    <proposal                         href="derby_proposal.html"/>
   </about>
-  <releases>
-    <release10021 href="releases/release-10.0.2.1.html"/>
-    <release10110 href="releases/release-10.1.1.0.html"/>
-    <release10121 href="releases/release-10.1.2.1.html"/>
-  </releases>
+
+  <quick_links label="Quick Links" tab="home">
+    <asf       label="ASF"               href="http://www.apache.org"/>
+    <db        label="Apache DB Project" href="http://db.apache.org"/>
+    <wiki      label="Derby Wiki"        href="http://wiki.apache.org/db-derby/"/>
+    <license   label="License"           href="license.html"/>
+    <faq       label="FAQs"              href="faq.html"/>
+  </quick_links>
+
+
+  <download label="Download" tab="download">
+    <index     label="Overview"          href="derby_downloads.html"/>
+    <license   label="License"           href="license.html"/>
+    <latests   label="10.1.2.1"          href="releases/release-10.1.2.1.cgi"/>
+    <releases>
+      <release10021 href="releases/release-10.0.2.1.html"/>
+      <release10110 href="releases/release-10.1.1.0.html"/>
+      <release10121 href="releases/release-10.1.2.1.html"/>
+    </releases>
+  </download>
 
   <community     label="Community"     tab="community">
     <index       label="Get Involved!" href="derby_comm.html"/>
+    <faq         label="FAQs"          href="faq.html"/>
     <derby_mail  label="Mailing Lists" href="derby_mail.html"/>
-    <derby_wiki  label="Wiki"          href="http://wiki.apache.org/db-derby"/>
+    <derby_wiki  label="Derby Wiki"    href="http://wiki.apache.org/db-derby"/>
     <derby_bugs  label="BUGS"          href="DerbyBugGuidelines.html"/>
     <derby_tests label="Tests"         href="derby_tests.html"/>
-    <derby_todo  label="To-Do"         href="DerbyToDo.html"/>
-    <logo        label="Logo Contest"  href="logo_contest.html"/>
+    <logo        label="Logo"          href="logo.html"/>
+    <derby_web   label="Updating the web site" href="papers/derby_web.html"/>
   </community>
 
-  <papers label="Papers" href="papers/" tab="papers">
-       <index     label="Index" href="index.html"/>
-       <fortune   href="fortune_tut.html"/>
-       <derby_web label="Derby Web Site" href="derby_web.html"/>
-       <howto     label="Instruction" href="http://wiki.apache.org/db-derby/DerbyInstruction"
/>
-       <articles label="Articles/Books" href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles"
/>
-       <derbyTut label="Derby Tutorial" href="DerbyTut/">
-           <index    label="Overview"             href="index.html"/>
-           <install  label="Step 1: Install Software"     href="install_software.html"/>
-           <ij_intro label="Step 2: ij Basics"            href="ij_intro.html"/>
-           <embed    label="Step 3: Embedded Derby"       href="embedded_intro.html"/>
-           <ns       label="Step 4: Derby Network Server" href="ns_intro.html"/>
-       </derbyTut>
-  </papers>
-
-  <engine label="Derby Engine" href="papers/" tab="papers">
-      <javadoc  label="Javadoc">
-             <engine  label="Engine" href="http://db.apache.org/derby/javadoc/engine"/>
-             <language label="Language" href="http://db.apache.org/derby/javadoc/language"/>
-             <tools label="Tools" href="http://db.apache.org/derby/javadoc/tools"/>
-             <api label="API" href="http://db.apache.org/derby/javadoc/publishedapi"/>
-      </javadoc>
-      <index     label="Architecture"           href="derby_arch.html"/>
-      <index     label="BTree"                  href="btree_package.html"/>
-      <pformat   label="Disk Page Format"       href="pageformats.html"/>
-      <misc      label="How Things Work"        href="derby_htw.html"/>
-      <intersect label="Intersect &amp; Except" href="Intersect-design.html"/>
-      <jdbc      label="JDBC"                   href="JDBCImplementation.html"/>
-      <log       label="Log Format"             href="logformats.html"/>
-      <recover   label="Logging &amp; Recovery" href="recovery.html"/>
-      <optimizer label="Optimizer"              href="optimizer.html"/>
-      <types     label="Type System" href="http://svn.apache.org/repos/asf/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/package.html"/>
-      <version   label="Versioning"             href="versionupgrade.html"/>
-  </engine>
-
-  <net_client label="Derby Network Client" href="papers/" tab="papers">
-      <func_spec  label="Functional Spec"       href="DerbyClientSpec.html"/>
-  </net_client>
-
-  <present label="Presentations" href="papers/" tab="papers">
-      <apacheCon label="ApacheCon"  href="ApacheCon.html"/>
-      <oscon05   label="OSCON 2005"        href="MiscPresentations.html#OSCON+2005"/>
-      <colorado  label="Colorado 2004"     href="MiscPresentations.html#Colorado+Software+Summit+2004"/>
-  </present>
-
-
+  <manuals label="Documentation" href="manuals/" tab="docs">
+    <index     label="Overview"         href="index.html"/>
+    <latest    label="Latest Manuals"   href="index.html#latest"/>
+    <docs_101  label="10.1 Manuals"     href="index.html#docs_10.1"/>
+    <docs_100  label="10.0 Manuals"     href="index.html#docs_10.0"/>
+    <bugs      label="Report Issues"    href="index.html#doc_issues"/>
+    <ditafile  label="DITA Source"      href="dita.html" />
+  </manuals>
 
-  <integrate label="Integration" href="integrate/" tab="integrate">
-      <index     label="Index"        href="index.html"/>
-      <uses      label="UsesOfDerby"  href="http://wiki.apache.org/db-derby/UsesOfDerby"/>
-      <cjdbc-pdf label="C-JDBC (PDF)" href="../binaries/HOWTO_CJDBC_Derby_v0.2.pdf"/>
-      <cjdbc-oo  label="C-JDBC (SXW)" href="../binaries/HOWTO_CJDBC_Derby_v0.2.sxw"/>
-      <ddlutils  label="DdlUtils"     href="db_ddlutils.html"/>
-      <dots      label="DOTS Derby"   href="DOTS_Derby.htm"/>
-      <dots      label="DOTS System"  href="../binaries/UsingDotsDerbySystemTest.pdf"/>
-      <emma      label="EMMA"         href="../binaries/DerbyCodeCoverageUsingEmma.pdf"/>
-      <jonas     label="JOnAS (PDF)"  href="../binaries/DerbyAndRedHatAppServer.pdf" />
-      <jpox      label="JPOX JDO"     href="JPOX_Derby.html"/>
-      <jpetstoreG label="Geronimo Demo" href="JPetStoreGeronimo.html" />
-      <tomcat     label="Tomcat Demo"   href="DerbyTomcat5512JPetStor.html" />
-      <torque     label="Torque" href="db_torque.html" />
-      <jpetstoreW label="WebSphere Demo" href="JPetStoreWebSphere.html" />
-      <misc                              href="misc.html"/>
+  <integrate label="Other Products" href="integrate/" tab="resources">
+      <index    label="Overview" href="index.html"/>
+      <uses     label="What works with Derby?"  href="index.html#uses"/>
+      <products label="Product Writeups"        href="index.html#products"/>
   </integrate>
 
-      <eclipse label="Eclipse Plug-ins" href="integrate/" tab="integrate">
+
+  <eclipse label="Eclipse Plug-ins" href="integrate/" tab="resources">
          <eclipse_old   label="10.1 Core"   href="derby_plugin.html"/>
          <eclipse_spec  label="1.0 UI Functional Spec"     href="func_spec_plugins.html"/>
          <eclipse_new   label="10.1 Core and 1.1 UI"   href="plugin_howto.html"/>
@@ -123,117 +88,51 @@
            <sysinfo label="Running sysinfo" href="sysinfo.html"/>
            <derby_doc label="Derby Manuals" href="resources.html"/>
          </eclipse_help>
-      </eclipse>
+  </eclipse>
 
-  <manuals label="Manuals" href="manuals/" tab="manuals">
-    <index label="About" href="index.html"/>
-    <ditafile label="DITA Source" href="dita.html" />
-    <english label="English" href="">
-    <devbooks label="Latest Alpha Manuals" href="">
-         <api label="API" href="http://db.apache.org/derby/javadoc/publishedapi"/>
-           <gstart label="Getting Started" href="">
-              <getstart1 label="PDF"  href="http://db.apache.org/derby/docs/dev/getstart/getstartderby.pdf"/>
-              <getstart2 label="HTML Book" href="http://db.apache.org/derby/docs/dev/getstart/getstart-single.html"/>
-              <getstart2 label="HTML Files" href="http://db.apache.org/derby/docs/dev/getstart/"/>
-           </gstart>
-
-           <refman label="Reference" href="">
-              <ref1 label="PDF"  href="http://db.apache.org/derby/docs/dev/ref/refderby.pdf"/>
-              <ref2 label="HTML Book" href="http://db.apache.org/derby/docs/dev/ref/ref-single.html"/>
-              <ref2 label="HTML Files" href="http://db.apache.org/derby/docs/dev/ref/"/>
-           </refman>
-           <devman label="Developer's Guide" href="">
-             <dev1 label="PDF" href="http://db.apache.org/derby/docs/dev/devguide/derbydev.pdf"/>
-             <dev2 label="HTML Book" href="http://db.apache.org/derby/docs/dev/devguide/devguide-single.html"/>
-             <dev2 label="HTML Files" href="http://db.apache.org/derby/docs/dev/devguide/"/>
-           </devman>
-
-           <tuneman label="Tuning Derby" href="">
-              <tune1 label="PDF" href="http://db.apache.org/derby/docs/dev/tuning/tuningderby.pdf"/>
-              <tune2 label="HTML Book" href="http://db.apache.org/derby/docs/dev/tuning/tuning-single"/>
-              <tune2 label="HTML Files" href="http://db.apache.org/derby/docs/dev/tuning/"/>
-           </tuneman>
-
-           <adminman label="Server &amp; Admin" href="">
-              <admin1 label="PDF" href="http://db.apache.org/derby/docs/dev/adminguide/derbyadmin.pdf"/>
-              <admin2 label="HTML Book" href="http://db.apache.org/derby/docs/dev/adminguide/adminguide-single.html"/>
-              <admin2 label="HTML Files" href="http://db.apache.org/derby/docs/dev/adminguide/"/>
-           </adminman>
-
-           <toolsman label="Tools &amp; Utility Guide" href="">
-              <tools1 label="PDF" href="http://db.apache.org/derby/docs/dev/tools/derbytools.pdf"/>
-              <tools2 label="HTML Book" href="http://db.apache.org/derby/docs/dev/tools/tools-single.html"/>
-              <tools2 label="HTML Files" href="http://db.apache.org/derby/docs/dev/tools/"/>
-           </toolsman>
-     </devbooks>
-    <rel10.1 label="10.1 Manuals" href="">
-      <api label="API" href="http://db.apache.org/derby/docs/10.1/publishedapi"/>
-
-           <gstart label="Getting Started" href="">
-              <getstart1 label="PDF"  href="http://db.apache.org/derby/docs/10.1/getstart/getstartderby.pdf"/>
-              <getstart2 label="HTML Book" href="http://db.apache.org/derby/docs/10.1/getstart/getstart-single.html"/>
-              <getstart2 label="HTML Files" href="http://db.apache.org/derby/docs/10.1/getstart/"/>
-           </gstart>
-
-           <refman label="Reference" href="">
-              <ref1 label="PDF"  href="http://db.apache.org/derby/docs/10.1/ref/refderby.pdf"/>
-              <ref2 label="HTML Book" href="http://db.apache.org/derby/docs/10.1/ref/ref-single.html"/>
-              <ref2 label="HTML Files" href="http://db.apache.org/derby/docs/10.1/ref/"/>
-           </refman>
-           <devman label="Developer's Guide" href="">
-             <dev1 label="PDF" href="http://db.apache.org/derby/docs/10.1/devguide/derbydev.pdf"/>
-             <dev2 label="HTML Book" href="http://db.apache.org/derby/docs/10.1/devguide/devguide-single.html"/>
-             <dev2 label="HTML Files" href="http://db.apache.org/derby/docs/10.1/devguide/"/>
-           </devman>
-
-           <tuneman label="Tuning Derby" href="">
-              <tune1 label="PDF" href="http://db.apache.org/derby/docs/10.1/tuning/tuningderby.pdf"/>
-              <tune2 label="HTML Book" href="http://db.apache.org/derby/docs/10.1/tuning/tuning-single"/>
-              <tune2 label="HTML Files" href="http://db.apache.org/derby/docs/10.1/tuning/"/>
-           </tuneman>
-
-           <adminman label="Server &amp; Admin" href="">
-              <admin1 label="PDF" href="http://db.apache.org/derby/docs/10.1/adminguide/derbyadmin.pdf"/>
-              <admin2 label="HTML Book" href="http://db.apache.org/derby/docs/10.1/adminguide/adminguide-single.html"/>
-              <admin2 label="HTML Files" href="http://db.apache.org/derby/docs/10.1/adminguide/"/>
-           </adminman>
-
-           <toolsman label="Tools &amp; Utility Guide" href="">
-              <tools1 label="PDF" href="http://db.apache.org/derby/docs/10.1/tools/derbytools.pdf"/>
-              <tools2 label="HTML Book" href="http://db.apache.org/derby/docs/10.1/tools/tools-single.html"/>
-              <tools2 label="HTML Files" href="http://db.apache.org/derby/docs/10.1/tools/"/>
-           </toolsman>
-     </rel10.1>
-    <original label="10.0 Manuals" href="">
-      <api label="API" href="http://db.apache.org/derby/docs/10.0/publishedapi"/>
-      <docs_zip  label="All docs: zip"    href="http://db.apache.org/derby/docs/docs-10.0.zip"/>
-      <docs_zip  label="All docs: tar.gz" href="http://db.apache.org/derby/docs/docs-10.0.tar.gz"/>
-      <getstart label="Getting Started" href="http://db.apache.org/derby/docs/10.0/manuals/getstart/gspr02.html"/>
-      <reference label="Reference Manual" href="http://db.apache.org/derby/docs/10.0/manuals/reference/sqlj02.html"/>
-      <develop label="Developer's Guide" href="http://db.apache.org/derby/docs/10.0/manuals/develop/develop02.html"/>
-      <tuning label="Tuning Derby" href="http://db.apache.org/derby/docs/10.0/manuals/tuning/perf02.html"/>
-      <admin label="Server &amp; Admin Guide" href="http://db.apache.org/derby/docs/10.0/manuals/admin/hubprnt02.html"/>
-      <tools label="Tools &amp; Utility Guide" href="http://db.apache.org/derby/docs/10.0/manuals/tools/tools02.html"/>
-    </original>
-    </english>
-
-    <brazport label="Brazilian Portuguese" href="">
-      <brazalpha label="Latest Alpha Manuals" href="">
-           <gstart label="Introdu&#231;&#227;o ao Derby" href="">
-              <getstart1 label="PDF"  href="http://db.apache.org/derby/docs/dev/pt_BR/getstart/getstartderby.pdf"/>
-              <getstart2 label="HTML Book" href="http://db.apache.org/derby/docs/dev/pt_BR/getstart/pt_BR/getstart-single.html"/>
-              <getstart2 label="HTML Files" href="http://db.apache.org/derby/docs/dev/pt_BR/getstart/"/>
-           </gstart>
-           <refman label="Manual de Refer&#234;ncia do Derby" href="">
-              <ref1 label="PDF"  href="http://db.apache.org/derby/docs/dev/pt_BR/ref/refderby.pdf"/>
-              <ref2 label="HTML Book" href="http://db.apache.org/derby/docs/dev/pt_BR/ref/pt_BR/ref-single.html"/>
-              <ref2 label="HTML Files" href="http://db.apache.org/derby/docs/dev/pt_BR/ref/"/>
-           </refman>
-      </brazalpha>
-    </brazport>
+  <papers label="Papers" href="papers/" tab="resources">
+     <index     label="Overview" href="index.html"/>
+     <fortune                    href="fortune_tut.html"/>
+
+     <engine label="Derby Engine" tab="resources">
+        <javadoc  label="Javadoc">
+           <engine  label="Engine" href="http://db.apache.org/derby/javadoc/engine"/>
+           <language label="Language" href="http://db.apache.org/derby/javadoc/language"/>
+           <tools label="Tools" href="http://db.apache.org/derby/javadoc/tools"/>
+           <api label="API" href="http://db.apache.org/derby/javadoc/publishedapi"/>
+        </javadoc>
+        <index     label="Architecture"           href="derby_arch.html"/>
+        <index     label="BTree"                  href="btree_package.html"/>
+        <pformat   label="Disk Page Format"       href="pageformats.html"/>
+        <misc      label="How Things Work"        href="derby_htw.html"/>
+        <intersect label="Intersect &amp; Except" href="Intersect-design.html"/>
+        <jdbc      label="JDBC"                   href="JDBCImplementation.html"/>
+        <log       label="Log Format"             href="logformats.html"/>
+        <recover   label="Logging &amp; Recovery" href="recovery.html"/>
+        <optimizer label="Optimizer"              href="optimizer.html"/>
+        <types     label="Type System" href="http://svn.apache.org/repos/asf/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/package.html"/>
+        <version   label="Versioning"             href="versionupgrade.html"/>
+    </engine>
+
+    <net_client label="Derby Network Client" tab="resources">
+         <func_spec  label="Functional Spec"  href="DerbyClientSpec.html"/>
+     </net_client>
 
-  </manuals>
+     <derbyTut label="Derby Tutorial" href="DerbyTut/">
+           <index    label="Overview"             href="index.html"/>
+           <install  label="Step 1: Install Software"     href="install_software.html"/>
+           <ij_intro label="Step 2: ij Basics"            href="ij_intro.html"/>
+           <embed    label="Step 3: Embedded Derby"       href="embedded_intro.html"/>
+           <ns       label="Step 4: Derby Network Server" href="ns_intro.html"/>
+     </derbyTut>
 
+     <present label="Presentations" tab="resources">
+         <apacheCon label="ApacheCon"  href="ApacheCon.html"/>
+         <oscon05   label="OSCON 2005"        href="MiscPresentations.html#OSCON+2005"/>
+         <colorado  label="Colorado 2004"     href="MiscPresentations.html#Colorado+Software+Summit+2004"/>
+     </present>
+
+  </papers>
 
   <!-- Uncomment this if we want aggregate HTML/PDFs for this site
   <all>

Modified: db/derby/site/trunk/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/tabs.xml?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/tabs.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/tabs.xml Thu Mar 30 10:21:49 2006
@@ -14,9 +14,10 @@
     If @id's are present, site.xml entries with a matching @tab will be in that tab.
   -->
 
-  <tab id="home"      label="Home"        dir="" indexfile="index.html"/>
-  <tab id="community" label="Community"   dir="" indexfile="derby_comm.html"/>
-  <tab id="manuals"   label="Manuals"     dir="manuals" indexfile="index.html"/>
-  <tab id="papers"    label="Papers"      dir="papers" indexfile="index.html"/>
-  <tab id="integrate" label="Integration" dir="integrate" indexfile="index.html"/>
+  <tab id="home"      label="Home"          dir="" indexfile="index.html"/>
+  <tab id="quick"     label="Quick Start"   dir="" indexfile="quick_start.html"/>
+  <tab id="download"  label="Download"      dir="" indexfile="derby_downloads.html"/>
+  <tab id="community" label="Community"     dir="" indexfile="derby_comm.html"/>
+  <tab id="docs"      label="Documentation" dir="manuals" indexfile="index.html"/>
+  <tab id="resources" label="Resources"     dir="integrate" indexfile="index.html"/>
 </tabs>

Modified: db/derby/site/trunk/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/skinconf.xml?rev=390204&r1=390203&r2=390204&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/skinconf.xml (original)
+++ db/derby/site/trunk/src/documentation/skinconf.xml Thu Mar 30 10:21:49 2006
@@ -320,8 +320,6 @@
     <color name="footer" value="#ffffff"/>
 -->
  <!-- Color group: Lenya using pelt-->
-<!--
-
     <color name="header" value="#ffffff"/>
 
     <color name="tab-selected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/>
@@ -330,8 +328,8 @@
     <color name="subtab-unselected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/>
 
     <color name="heading" value="#E5E4D9"/>
-    <color name="subheading" value="#000000"/>
-    <color name="published" value="#000000"/>
+    <color name="subheading" value="#E5E4D9"/>
+    <color name="published" value="#FFFFFF"/>
     <color name="navstrip" value="#E5E4D9" font="#000000"/>
     <color name="toolbox" value="#CFDCED" font="#000000"/>
     <color name="border" value="#999999"/>
@@ -349,7 +347,6 @@
     <color name="code" value="#003366"/>
 
     <color name="footer" value="#E5E4D9"/>
--->
   </colors>
  
   <!-- Settings specific to PDF output. -->



Mime
View raw message