You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by jt...@apache.org on 2006/02/15 05:14:55 UTC
svn commit: r377932 - in /db/derby/site/trunk: build/site/
build/site/papers/ build/site/releases/ src/documentation/content/xdocs/
src/documentation/content/xdocs/releases/
Author: jta
Date: Tue Feb 14 20:14:51 2006
New Revision: 377932
URL: http://svn.apache.org/viewcvs?rev=377932&view=rev
Log:
Split charter out from index page into a separate file.
Filled in some old News on the index page.
Removed proposal from menu; linked to it from index page and charter. Changing
the menu causes all pages on the home tab to be modified.
Added:
db/derby/site/trunk/build/site/derby_charter.html (with props)
db/derby/site/trunk/src/documentation/content/xdocs/derby_charter.xml (with props)
Modified:
db/derby/site/trunk/build/site/derby_downloads.html
db/derby/site/trunk/build/site/derby_proposal.html
db/derby/site/trunk/build/site/faq.html
db/derby/site/trunk/build/site/index.html
db/derby/site/trunk/build/site/license.html
db/derby/site/trunk/build/site/linkmap.html
db/derby/site/trunk/build/site/papers/fortune_tut.html
db/derby/site/trunk/build/site/releases/release-10.0.2.1.html
db/derby/site/trunk/src/documentation/content/xdocs/index.xml
db/derby/site/trunk/src/documentation/content/xdocs/releases/release-10.0.2.1.xml
db/derby/site/trunk/src/documentation/content/xdocs/site.xml
Added: db/derby/site/trunk/build/site/derby_charter.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/derby_charter.html?rev=377932&view=auto
==============================================================================
--- db/derby/site/trunk/build/site/derby_charter.html (added)
+++ db/derby/site/trunk/build/site/derby_charter.html Tue Feb 14 20:14:51 2006
@@ -0,0 +1,303 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta content="Apache Forrest" name="Generator">
+<meta name="Forrest-version" content="0.7">
+<meta name="Forrest-skin-name" content="pelt">
+<title>Apache Derby Project Charter</title>
+<link type="text/css" href="skin/basic.css" rel="stylesheet">
+<link media="screen" type="text/css" href="skin/screen.css" rel="stylesheet">
+<link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
+<link type="text/css" href="skin/profile.css" rel="stylesheet">
+<script src="skin/getBlank.js" language="javascript" type="text/javascript"></script><script src="skin/getMenu.js" language="javascript" type="text/javascript"></script><script src="skin/fontsize.js" language="javascript" type="text/javascript"></script>
+<link rel="shortcut icon" href="">
+</head>
+<body onload="init()">
+<script type="text/javascript">ndeSetTextSize();</script>
+<div id="top">
+<div class="breadtrail">
+<a href="http://www.apache.org/">apache</a> > <a href="http://db.apache.org/">db</a><script src="skin/breadcrumbs.js" language="JavaScript" type="text/javascript"></script>
+</div>
+<div class="header">
+<div class="grouplogo">
+<a href="http://db.apache.org/derby"><img class="logoImage" alt="Apache Derby" src="images/derby-logo-web.png" title="Derby is a zero-admin Java RDBMS"></a>
+</div>
+<div class="projectlogoA1">
+<a href="http://db.apache.org"><img class="logoImage" alt="Apache DB Project" src="images/db-logo-white.png" title="Apache DB creates and maintains database solutions."></a>
+</div>
+<ul id="tabs">
+<li class="current">
+<a class="base-selected" href="index.html">Home</a>
+</li>
+<li>
+<a class="base-not-selected" href="derby_comm.html">Community</a>
+</li>
+<li>
+<a class="base-not-selected" href="manuals/index.html">Manuals</a>
+</li>
+<li>
+<a class="base-not-selected" href="papers/index.html">Papers</a>
+</li>
+<li>
+<a class="base-not-selected" href="integrate/index.html">Integration</a>
+</li>
+</ul>
+</div>
+</div>
+<div id="main">
+<div id="publishedStrip">
+<div id="level2tabs"></div>
+<script type="text/javascript"><!--
+document.write("<text>Last Published:</text> " + document.lastModified);
+// --></script>
+</div>
+<div class="breadtrail">
+
+
+ </div>
+<div id="menu">
+<div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Derby</div>
+<div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
+<div class="menuitem">
+<a href="index.html">Index</a>
+</div>
+<div class="menuitem">
+<a href="faq.html">FAQs</a>
+</div>
+<div class="menuitem">
+<a href="derby_downloads.html">Downloads</a>
+</div>
+<div class="menuitem">
+<a href="license.html">License</a>
+</div>
+<div class="menupage">
+<div class="menupagetitle">Charter</div>
+</div>
+</div>
+<div class="searchbox">
+<hr>
+<form action="http://www.google.com/search" method="get">
+<input value="db.apache.org" name="sitesearch" type="hidden"><input onFocus="getBlank (this, 'Search the site with google');" size="18" name="q" id="query" type="text" value="Search the site with google">
+ <input attr="value" name="Search" value="Search" type="submit">
+</form>
+</div>
+<div id="credit"></div>
+<div id="roundbottom">
+<img style="display: none" class="corner" height="15" width="15" alt="" src="skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
+<div id="credit2"></div>
+</div>
+<div id="content">
+<div class="trail">
+<text>Font size:</text>
+ <input value="Reset" class="resetfont" title="Reset text" onclick="ndeSetTextSize('reset'); return false;" type="button">
+ <input value="-a" class="smallerfont" title="Shrink text" onclick="ndeSetTextSize('decr'); return false;" type="button">
+ <input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
+</div>
+<h1>Apache Derby Project Charter</h1>
+<div id="minitoc-area">
+<ul class="minitoc">
+<li>
+<a href="#Derby+Project+Charter">Derby Project Charter</a>
+<ul class="minitoc">
+<li>
+<a href="#Database+Technology">Database Technology</a>
+</li>
+<li>
+<a href="#Pure+Java">Pure Java</a>
+</li>
+<li>
+<a href="#Easy+to+Use">Easy to Use</a>
+</li>
+<li>
+<a href="#Small+Footprint">Small Footprint</a>
+</li>
+<li>
+<a href="#Standards+based">Standards based</a>
+</li>
+<li>
+<a href="#Secure">Secure</a>
+</li>
+</ul>
+</li>
+<li>
+<a href="#Derby+Technologies">Derby Technologies</a>
+<ul class="minitoc">
+<li>
+<a href="#Derby+embedded+database+engine">Derby embedded database engine</a>
+</li>
+<li>
+<a href="#Derby+network+server">Derby network server</a>
+</li>
+<li>
+<a href="#Database+Utilities">Database Utilities</a>
+</li>
+</ul>
+</li>
+<li>
+<a href="#Derby+History">Derby History</a>
+</li>
+</ul>
+</div>
+
+
+<a name="N1000C"></a><a name="Derby+Project+Charter"></a>
+<h2 class="boxed">Derby Project Charter</h2>
+<div class="section">
+<p>
+The Derby project develops open source database technology that is:
+</p>
+<ul>
+
+<li>Pure Java</li>
+
+<li>Easy to use</li>
+
+<li>Small footprint</li>
+
+<li>Standards based</li>
+
+<li>Secure</li>
+
+</ul>
+<a name="N10026"></a><a name="Database+Technology"></a>
+<h3 class="boxed">Database Technology</h3>
+<p>
+ Database technology is defined as software that processes data related
+ requests from applications.
+ Data requests include data definition, data modification and data retrieval.
+ Database GUI tooling and IDEs are not developed by the Derby project.
+ </p>
+<a name="N1002F"></a><a name="Pure+Java"></a>
+<h3 class="boxed">Pure Java</h3>
+<p>
+ Derby technology is written in Java to take advantage of Java’s write
+ once, run anywhere promise.
+ Java platforms such as OSGi, J2ME, J2SE and J2EE are supported as appropriate.
+ </p>
+<a name="N10038"></a><a name="Easy+to+Use"></a>
+<h3 class="boxed">Easy to Use</h3>
+<p>
+ Derby technology aims to be easy to use for software developers and zero administration for end users.
+ </p>
+<a name="N10041"></a><a name="Small+Footprint"></a>
+<h3 class="boxed">Small Footprint</h3>
+<p>
+ Derby technologies are designed to provide significant useful
+ functionality in a small code size footprint with efficient runtime
+ resource usage.
+ </p>
+<a name="N1004A"></a><a name="Standards+based"></a>
+<h3 class="boxed">Standards based</h3>
+<p>
+ Derby technology adheres to database standards such as JDBC
+ and ANSI SQL standards.
+ This means Derby provides the functionality expected of a modern relational
+ database,
+ including SQL syntax, transaction management, concurrency, triggers,
+ and online backups.
+ And it also means developers can later migrate to other databases if they
+ so choose.
+ </p>
+<a name="N10053"></a><a name="Secure"></a>
+<h3 class="boxed">Secure</h3>
+<p>
+ Derby technology provides secure data management appropriate to environment
+ the engine is executing in. Traditional enterprise database systems rely on
+ the machine being physically protected (locked machine room) for security,
+ Derby databases are often in unprotected environments, such as laptops and
+ unattended hardware.
+ </p>
+</div>
+
+
+<a name="N1005D"></a><a name="Derby+Technologies"></a>
+<h2 class="boxed">Derby Technologies</h2>
+<div class="section">
+<a name="N10062"></a><a name="Derby+embedded+database+engine"></a>
+<h3 class="boxed">Derby embedded database engine</h3>
+<p>
+ The core of the technology, Derby’s database engine is a full
+ functioned relational embedded database engine. JDBC and SQL are the
+ programming APIs.
+ </p>
+<a name="N1006B"></a><a name="Derby+network+server"></a>
+<h3 class="boxed">Derby network server</h3>
+<p>
+ The Derby network server increases the reach of the Derby database
+ engine by providing traditional client server functionality.
+ The network server allows clients to connect over TCP/IP using the standard
+ DRDA protocol.
+ The network server allows the Derby engine to support networked JDBC,
+ ODBC/CLI, Perl and PHP.
+ </p>
+<a name="N10074"></a><a name="Database+Utilities"></a>
+<h3 class="boxed">Database Utilities</h3>
+<ul>
+
+<li>
+<span class="codefrag">ij</span> -- a tool that allows SQL scripts to be executed
+ against any JDBC database.
+ </li>
+
+<li>
+<span class="codefrag">dblook</span> -- Schema extraction tool for a Derby database.
+ </li>
+
+<li>
+<span class="codefrag">sysinfo</span> -- Utility to display version numbers and
+ class path.
+ </li>
+
+</ul>
+</div>
+
+
+<a name="N10090"></a><a name="Derby+History"></a>
+<h2 class="boxed">Derby History</h2>
+<div class="section">
+<p>
+Cloudscape Inc, an Oakland, California start-up, was founded in 1996 to
+develop Java database technology. The first release of the database engine,
+then called JBMS, was in 1997.
+Subsequently the product was renamed Cloudscape and releases were made about
+every six months.
+In 1999 Informix Software, Inc., acquired Cloudscape, Inc.
+In 2001 IBM acquired the database assets of Informix Software,
+including Cloudscape.
+The database engine was re-branded to IBM Cloudscape and releases continued,
+mainly focussing on embedded use with IBM's Java products and middleware.
+In August 2004 IBM contributed the code to the Apache Software Foundation
+as Derby, an Incubator project sponsored by the Apache DB project
+(<a href="derby_proposal.html">see the Incubator proposal</a>).
+In July 2005 Derby graduated from the Incubator into the Apache DB project.
+</p>
+</div>
+
+
+<p>
+
+<em>Last updated: 14-February-2006</em>
+
+</p>
+
+
+</div>
+<div class="clearboth"> </div>
+</div>
+<div id="footer">
+<div class="lastmodified">
+<script type="text/javascript"><!--
+document.write("<text>Last Published:</text> " + document.lastModified);
+// --></script>
+</div>
+<div class="copyright">
+ Copyright ©
+ 2004-2005 Apache Software Foundation</div>
+<div id="feedback">
+ Send feedback about the website to:
+ <a id="feedbackto" href="mailto:derby-dev@db.apache.org?subject=Feedback%C2%A0derby_charter.html">derby-dev@db.apache.org</a>
+</div>
+</div>
+</body>
+</html>
Propchange: db/derby/site/trunk/build/site/derby_charter.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/site/trunk/build/site/derby_downloads.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/derby_downloads.html?rev=377932&r1=377931&r2=377932&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/derby_downloads.html (original)
+++ db/derby/site/trunk/build/site/derby_downloads.html Tue Feb 14 20:14:51 2006
@@ -60,19 +60,19 @@
<div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Derby</div>
<div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
<div class="menuitem">
-<a href="index.html">Welcome</a>
-</div>
-<div class="menuitem">
-<a href="license.html">License</a>
-</div>
-<div class="menuitem">
-<a href="derby_proposal.html">Proposal</a>
+<a href="index.html">Index</a>
</div>
<div class="menuitem">
<a href="faq.html">FAQs</a>
</div>
<div class="menupage">
<div class="menupagetitle">Downloads</div>
+</div>
+<div class="menuitem">
+<a href="license.html">License</a>
+</div>
+<div class="menuitem">
+<a href="derby_charter.html">Charter</a>
</div>
</div>
<div class="searchbox">
Modified: db/derby/site/trunk/build/site/derby_proposal.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/derby_proposal.html?rev=377932&r1=377931&r2=377932&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/derby_proposal.html (original)
+++ db/derby/site/trunk/build/site/derby_proposal.html Tue Feb 14 20:14:51 2006
@@ -27,8 +27,8 @@
<a href="http://db.apache.org"><img class="logoImage" alt="Apache DB Project" src="images/db-logo-white.png" title="Apache DB creates and maintains database solutions."></a>
</div>
<ul id="tabs">
-<li class="current">
-<a class="base-selected" href="index.html">Home</a>
+<li>
+<a class="base-not-selected" href="index.html">Home</a>
</li>
<li>
<a class="base-not-selected" href="derby_comm.html">Community</a>
@@ -57,22 +57,460 @@
</div>
<div id="menu">
-<div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Derby</div>
-<div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
+<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">Derby</div>
+<div id="menu_1.1" class="menuitemgroup">
<div class="menuitem">
-<a href="index.html">Welcome</a>
+<a href="index.html">Index</a>
+</div>
+<div class="menuitem">
+<a href="faq.html">FAQs</a>
+</div>
+<div class="menuitem">
+<a href="derby_downloads.html">Downloads</a>
</div>
<div class="menuitem">
<a href="license.html">License</a>
</div>
-<div class="menupage">
-<div class="menupagetitle">Proposal</div>
+<div class="menuitem">
+<a href="derby_charter.html">Charter</a>
+</div>
</div>
+<div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Community</div>
+<div id="menu_1.2" class="menuitemgroup">
<div class="menuitem">
-<a href="faq.html">FAQs</a>
+<a href="derby_comm.html">Get Involved!</a>
</div>
<div class="menuitem">
-<a href="derby_downloads.html">Downloads</a>
+<a href="derby_mail.html">Mailing Lists</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby">Wiki</a>
+</div>
+<div class="menuitem">
+<a href="DerbyBugGuidelines.html">BUGS</a>
+</div>
+<div class="menuitem">
+<a href="derby_tests.html">Tests</a>
+</div>
+<div class="menuitem">
+<a href="DerbyToDo.html">To-Do</a>
+</div>
+<div class="menuitem">
+<a href="logo_contest.html">Logo Contest</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.3', 'skin/')" id="menu_1.3Title" class="menutitle">Papers</div>
+<div id="menu_1.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="papers/index.html">Index</a>
+</div>
+<div class="menuitem">
+<a href="papers/derby_web.html">Derby Web Site</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyInstruction">Instruction</a>
+</div>
+<div class="menuitem">
+<a href="http://wiki.apache.org/db-derby/DerbyBooksAndArticles">Articles/Books</a>
+</div>
+<div onclick="SwitchMenu('menu_1.3.5', 'skin/')" id="menu_1.3.5Title" class="menutitle">Derby Tutorial</div>
+<div id="menu_1.3.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="papers/DerbyTut/index.html">Overview</a>
+</div>
+<div class="menuitem">
+<a href="papers/DerbyTut/install_software.html">Step 1: Install Software</a>
+</div>
+<div class="menuitem">
+<a href="papers/DerbyTut/ij_intro.html">Step 2: ij Basics</a>
+</div>
+<div class="menuitem">
+<a href="papers/DerbyTut/embedded_intro.html">Step 3: Embedded Derby</a>
+</div>
+<div class="menuitem">
+<a href="papers/DerbyTut/ns_intro.html">Step 4: Derby Network Server</a>
+</div>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.4', 'skin/')" id="menu_1.4Title" class="menutitle">Derby Engine</div>
+<div id="menu_1.4" class="menuitemgroup">
+<div onclick="SwitchMenu('menu_1.4.1', 'skin/')" id="menu_1.4.1Title" class="menutitle">Javadoc</div>
+<div id="menu_1.4.1" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/engine">Engine</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/language">Language</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/tools">Tools</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>
+</div>
+</div>
+<div class="menuitem">
+<a href="papers/derby_arch.html">Architecture</a>
+</div>
+<div class="menuitem">
+<a href="papers/btree_package.html">BTree</a>
+</div>
+<div class="menuitem">
+<a href="papers/pageformats.html">Disk Page Format</a>
+</div>
+<div class="menuitem">
+<a href="papers/derby_htw.html">How Things Work</a>
+</div>
+<div class="menuitem">
+<a href="papers/Intersect-design.html">Intersect & Except</a>
+</div>
+<div class="menuitem">
+<a href="papers/JDBCImplementation.html">JDBC</a>
+</div>
+<div class="menuitem">
+<a href="papers/logformats.html">Log Format</a>
+</div>
+<div class="menuitem">
+<a href="papers/recovery.html">Logging & Recovery</a>
+</div>
+<div class="menuitem">
+<a href="papers/optimizer.html">Optimizer</a>
+</div>
+<div class="menuitem">
+<a href="http://svn.apache.org/repos/asf/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/package.html">Type System</a>
+</div>
+<div class="menuitem">
+<a href="papers/versionupgrade.html">Versioning</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.5', 'skin/')" id="menu_1.5Title" class="menutitle">Derby Network Client</div>
+<div id="menu_1.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="papers/DerbyClientSpec.html">Functional Spec</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.6', 'skin/')" id="menu_1.6Title" class="menutitle">Presentations</div>
+<div id="menu_1.6" class="menuitemgroup">
+<div class="menuitem">
+<a href="papers/ApacheCon.html">ApacheCon</a>
+</div>
+<div class="menuitem">
+<a href="papers/MiscPresentations.html#OSCON+2005">OSCON 2005</a>
+</div>
+<div class="menuitem">
+<a href="papers/MiscPresentations.html#Colorado+Software+Summit+2004">Colorado 2004</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.7', 'skin/')" id="menu_1.7Title" class="menutitle">Integration</div>
+<div id="menu_1.7" class="menuitemgroup">
+<div class="menuitem">
+<a href="integrate/index.html">Index</a>
+</div>
+<div class="menuitem">
+<a href="integrate/misc.html">Summary</a>
+</div>
+<div class="menuitem">
+<a href="binaries/HOWTO_CJDBC_Derby_v0.2.pdf">C-JDBC (PDF)</a>
+</div>
+<div class="menuitem">
+<a href="binaries/HOWTO_CJDBC_Derby_v0.2.sxw">C-JDBC (SXW)</a>
+</div>
+<div class="menuitem">
+<a href="integrate/DOTS_Derby.htm">DOTS Derby</a>
+</div>
+<div class="menuitem">
+<a href="binaries/UsingDotsDerbySystemTest.pdf">DOTS System</a>
+</div>
+<div class="menuitem">
+<a href="binaries/DerbyCodeCoverageUsingEmma.pdf">EMMA</a>
+</div>
+<div class="menuitem">
+<a href="binaries/DerbyAndRedHatAppServer.pdf">JOnAS (PDF)</a>
+</div>
+<div class="menuitem">
+<a href="integrate/JPetStoreGeronimo.html">Geronimo Demo</a>
+</div>
+<div class="menuitem">
+<a href="integrate/DerbyTomcat5512JPetStor.html">Tomcat Demo</a>
+</div>
+<div class="menuitem">
+<a href="integrate/db_torque.html">Torque</a>
+</div>
+<div class="menuitem">
+<a href="integrate/JPetStoreWebSphere.html">WebSphere Demo</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.8', 'skin/')" id="menu_1.8Title" class="menutitle">Eclipse Plug-ins</div>
+<div id="menu_1.8" class="menuitemgroup">
+<div class="menuitem">
+<a href="integrate/derby_plugin.html">10.1 Core</a>
+</div>
+<div class="menuitem">
+<a href="integrate/func_spec_plugins.html">1.0 UI Functional Spec</a>
+</div>
+<div class="menuitem">
+<a href="integrate/plugin_howto.html">10.1 Core and 1.1 UI</a>
+</div>
+<div class="menuitem">
+<a href="integrate/Readme.html">Building 1.1 UI</a>
+</div>
+<div class="menuitem">
+<a href="integrate/plugin_slides.html">Derby Plug-ins Slides and Lab</a>
+</div>
+<div onclick="SwitchMenu('menu_1.8.6', 'skin/')" id="menu_1.8.6Title" class="menutitle">10.1 Core and 1.1 UI Documentation</div>
+<div id="menu_1.8.6" class="menuitemgroup">
+<div class="menuitem">
+<a href="integrate/plugin_help/start_toc.html">Getting Started</a>
+</div>
+<div class="menuitem">
+<a href="integrate/plugin_help/java_project.html">Creating an Eclipse Project</a>
+</div>
+<div onclick="SwitchMenu('menu_1.8.6.3', 'skin/')" id="menu_1.8.6.3Title" class="menutitle">Derby Nature</div>
+<div id="menu_1.8.6.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="integrate/plugin_help/nature_toc.html">Adding or Removing</a>
+</div>
+<div class="menuitem">
+<a href="integrate/plugin_help/nature.html">Adding the Derby Nature</a>
+</div>
+<div class="menuitem">
+<a href="integrate/plugin_help/remove_nature.html">Removing the Derby Nature</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.8.6.4', 'skin/')" id="menu_1.8.6.4Title" class="menutitle">Network Server</div>
+<div id="menu_1.8.6.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="integrate/plugin_help/server_toc.html">Starting and Stopping</a>
+</div>
+<div class="menuitem">
+<a href="integrate/plugin_help/start_server.html">Starting the Server</a>
+</div>
+<div class="menuitem">
+<a href="integrate/plugin_help/stop_server.html">Stopping the Server</a>
+</div>
+</div>
+<div class="menuitem">
+<a href="integrate/plugin_help/properties.html">Derby Properties</a>
+</div>
+<div onclick="SwitchMenu('menu_1.8.6.6', 'skin/')" id="menu_1.8.6.6Title" class="menutitle">ij</div>
+<div id="menu_1.8.6.6" class="menuitemgroup">
+<div class="menuitem">
+<a href="integrate/plugin_help/ij_toc.html">Using ij</a>
+</div>
+<div class="menuitem">
+<a href="integrate/plugin_help/ij.html">SQL commands</a>
+</div>
+<div class="menuitem">
+<a href="integrate/plugin_help/ij2.html">SQL scripts</a>
+</div>
+</div>
+<div class="menuitem">
+<a href="integrate/plugin_help/derby_app.html">Building a Java App</a>
+</div>
+<div class="menuitem">
+<a href="integrate/plugin_help/sysinfo.html">Running sysinfo</a>
+</div>
+<div class="menuitem">
+<a href="integrate/plugin_help/resources.html">Derby Manuals</a>
+</div>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9', 'skin/')" id="menu_1.9Title" class="menutitle">Manuals</div>
+<div id="menu_1.9" class="menuitemgroup">
+<div class="menuitem">
+<a href="manuals/index.html">About</a>
+</div>
+<div onclick="SwitchMenu('menu_1.9.2', 'skin/')" id="menu_1.9.2Title" class="menutitle">10.0 Manuals</div>
+<div id="menu_1.9.2" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.0/publishedapi">API</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/docs-10.0.zip">All docs: zip</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/docs-10.0.tar.gz">All docs: tar.gz</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.0/manuals/getstart/gspr02.html">Getting Started</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.0/manuals/reference/sqlj02.html">Reference Manual</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.0/manuals/develop/develop02.html">Developer's Guide</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.0/manuals/tuning/perf02.html">Tuning Derby</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.0/manuals/admin/hubprnt02.html">Server & Admin Guide</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.0/manuals/tools/tools02.html">Tools & Utility Guide</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.3', 'skin/')" id="menu_1.9.3Title" class="menutitle">10.1 Manuals</div>
+<div id="menu_1.9.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/publishedapi">API</a>
+</div>
+<div class="menuitem">
+<a href="manuals/dita.html">DITA Source</a>
+</div>
+<div onclick="SwitchMenu('menu_1.9.3.3', 'skin/')" id="menu_1.9.3.3Title" class="menutitle">Getting Started</div>
+<div id="menu_1.9.3.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/getstart/getstartderby.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/getstart/getstart-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/getstart/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.3.4', 'skin/')" id="menu_1.9.3.4Title" class="menutitle">Reference</div>
+<div id="menu_1.9.3.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/ref/refderby.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/ref/ref-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/ref/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.3.5', 'skin/')" id="menu_1.9.3.5Title" class="menutitle">Developer's Guide</div>
+<div id="menu_1.9.3.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/devguide/derbydev.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/devguide/devguide-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/devguide/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.3.6', 'skin/')" id="menu_1.9.3.6Title" class="menutitle">Tuning Derby</div>
+<div id="menu_1.9.3.6" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/tuning/tuningderby.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/tuning/tuning-single">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/tuning/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.3.7', 'skin/')" id="menu_1.9.3.7Title" class="menutitle">Server & Admin</div>
+<div id="menu_1.9.3.7" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/adminguide/derbyadmin.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/adminguide/adminguide-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/adminguide/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.3.8', 'skin/')" id="menu_1.9.3.8Title" class="menutitle">Tools & Utility Guide</div>
+<div id="menu_1.9.3.8" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/tools/derbytools.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/tools/tools-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/10.1/tools/">HTML Files</a>
+</div>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.4', 'skin/')" id="menu_1.9.4Title" class="menutitle">Latest Alpha Manuals</div>
+<div id="menu_1.9.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/javadoc/publishedapi">API</a>
+</div>
+<div class="menuitem">
+<a href="manuals/dita.html">DITA Source</a>
+</div>
+<div onclick="SwitchMenu('menu_1.9.4.3', 'skin/')" id="menu_1.9.4.3Title" class="menutitle">Getting Started</div>
+<div id="menu_1.9.4.3" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/getstart/getstartderby.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/getstart/getstart-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/getstart/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.4.4', 'skin/')" id="menu_1.9.4.4Title" class="menutitle">Reference</div>
+<div id="menu_1.9.4.4" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/ref/refderby.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/ref/ref-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/ref/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.4.5', 'skin/')" id="menu_1.9.4.5Title" class="menutitle">Developer's Guide</div>
+<div id="menu_1.9.4.5" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/devguide/derbydev.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/devguide/devguide-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/devguide/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.4.6', 'skin/')" id="menu_1.9.4.6Title" class="menutitle">Tuning Derby</div>
+<div id="menu_1.9.4.6" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/tuning/tuningderby.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/tuning/tuning-single">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/tuning/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.4.7', 'skin/')" id="menu_1.9.4.7Title" class="menutitle">Server & Admin</div>
+<div id="menu_1.9.4.7" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/adminguide/derbyadmin.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/adminguide/adminguide-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/adminguide/">HTML Files</a>
+</div>
+</div>
+<div onclick="SwitchMenu('menu_1.9.4.8', 'skin/')" id="menu_1.9.4.8Title" class="menutitle">Tools & Utility Guide</div>
+<div id="menu_1.9.4.8" class="menuitemgroup">
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/tools/derbytools.pdf">PDF</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/tools/tools-single.html">HTML Book</a>
+</div>
+<div class="menuitem">
+<a href="http://db.apache.org/derby/docs/dev/tools/">HTML Files</a>
+</div>
+</div>
</div>
</div>
<div class="searchbox">
Modified: db/derby/site/trunk/build/site/faq.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/faq.html?rev=377932&r1=377931&r2=377932&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/faq.html (original)
+++ db/derby/site/trunk/build/site/faq.html Tue Feb 14 20:14:51 2006
@@ -60,19 +60,19 @@
<div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Derby</div>
<div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
<div class="menuitem">
-<a href="index.html">Welcome</a>
-</div>
-<div class="menuitem">
-<a href="license.html">License</a>
-</div>
-<div class="menuitem">
-<a href="derby_proposal.html">Proposal</a>
+<a href="index.html">Index</a>
</div>
<div class="menupage">
<div class="menupagetitle">FAQs</div>
</div>
<div class="menuitem">
<a href="derby_downloads.html">Downloads</a>
+</div>
+<div class="menuitem">
+<a href="license.html">License</a>
+</div>
+<div class="menuitem">
+<a href="derby_charter.html">Charter</a>
</div>
</div>
<div class="searchbox">
Modified: db/derby/site/trunk/build/site/index.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/index.html?rev=377932&r1=377931&r2=377932&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/index.html (original)
+++ db/derby/site/trunk/build/site/index.html Tue Feb 14 20:14:51 2006
@@ -5,7 +5,7 @@
<meta content="Apache Forrest" name="Generator">
<meta name="Forrest-version" content="0.7">
<meta name="Forrest-skin-name" content="pelt">
-<title>The Apache Derby Project</title>
+<title>Apache Derby</title>
<link type="text/css" href="skin/basic.css" rel="stylesheet">
<link media="screen" type="text/css" href="skin/screen.css" rel="stylesheet">
<link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
@@ -60,19 +60,19 @@
<div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Derby</div>
<div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
<div class="menupage">
-<div class="menupagetitle">Welcome</div>
+<div class="menupagetitle">Index</div>
</div>
<div class="menuitem">
-<a href="license.html">License</a>
+<a href="faq.html">FAQs</a>
</div>
<div class="menuitem">
-<a href="derby_proposal.html">Proposal</a>
+<a href="derby_downloads.html">Downloads</a>
</div>
<div class="menuitem">
-<a href="faq.html">FAQs</a>
+<a href="license.html">License</a>
</div>
<div class="menuitem">
-<a href="derby_downloads.html">Downloads</a>
+<a href="derby_charter.html">Charter</a>
</div>
</div>
<div class="searchbox">
@@ -97,7 +97,7 @@
<input value="-a" class="smallerfont" title="Shrink text" onclick="ndeSetTextSize('decr'); return false;" type="button">
<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
</div>
-<h1>The Apache Derby Project</h1>
+<h1>Apache Derby</h1>
<div id="minitoc-area">
<ul class="minitoc">
<li>
@@ -109,46 +109,6 @@
<li>
<a href="#News">News</a>
</li>
-<li>
-<a href="#Derby+Project+Charter">Derby Project Charter</a>
-<ul class="minitoc">
-<li>
-<a href="#Database+Technology">Database Technology</a>
-</li>
-<li>
-<a href="#Pure+Java">Pure Java</a>
-</li>
-<li>
-<a href="#Easy+to+Use">Easy to Use</a>
-</li>
-<li>
-<a href="#Small+Footprint">Small Footprint</a>
-</li>
-<li>
-<a href="#Standards+based">Standards based</a>
-</li>
-<li>
-<a href="#Secure">Secure</a>
-</li>
-</ul>
-</li>
-<li>
-<a href="#Derby+Technologies">Derby Technologies</a>
-<ul class="minitoc">
-<li>
-<a href="#Derby+embedded+database+engine">Derby embedded database engine</a>
-</li>
-<li>
-<a href="#Derby+network+server">Derby network server</a>
-</li>
-<li>
-<a href="#Database+Utilities">Database Utilities</a>
-</li>
-</ul>
-</li>
-<li>
-<a href="#Derby+History">Derby History</a>
-</li>
</ul>
</div>
@@ -210,207 +170,61 @@
<a name="N10053"></a><a name="News"></a>
<h2 class="boxed">News</h2>
<div class="section">
-<table class="ForrestTable" cellspacing="1" cellpadding="4">
-
-<tr>
+<ul>
-<td colspan="1" rowspan="1"> 10-Dec-2005</td>
- <td colspan="1" rowspan="1"> <a href="papers/ApacheCon.html">ApacheCon US 2005</a> had three
- Derby sessions.</td>
-
-</tr>
-
-<tr>
+<li> 10-Dec-2005:
+ <a href="papers/ApacheCon.html">ApacheCon US 2005</a> had three
+ Derby sessions.
+ </li>
-<td colspan="1" rowspan="1"> 18-Nov-2005</td>
- <td colspan="1" rowspan="1"> <a class="external" href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200511.mbox/%3c54ac72d70511230905y39e3e894k697acbdf3da0ba51@mail.gmail.com%3e">Derby 10.1.2.1 Released.</a> </td>
-
-</tr>
-
-<tr>
-
-<td colspan="1" rowspan="1">5-August-2005</td>
- <td colspan="1" rowspan="1">Press release (Japan): <a class="external" href="http://pcweb.mycom.co.jp/news/2005/08/05/011.html"><em>Apache
- Derby 10.1.1.0 Released - graduated from Apache Incubator</em></a></td>
-
-</tr>
-
-<tr>
+<li> 18-Nov-2005:
+ <a class="external" href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200511.mbox/%3c54ac72d70511230905y39e3e894k697acbdf3da0ba51@mail.gmail.com%3e">Derby 10.1.2.1 Release</a>
-<td colspan="1" rowspan="1"> 5-August-2005</td>
- <td colspan="1" rowspan="1"> <a class="external" href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200508.mbox/%3c54ac72d70508031445298f855e@mail.gmail.com%3e">Derby 10.1.1 Released.</a>
- </td>
-
-</tr>
-
-
-<tr>
-
-<td colspan="1" rowspan="1"> 4-August-2005</td>
- <td colspan="1" rowspan="1"> Press release (U.S.): <a class="external" href="http://news.com.com/Apache+Derby+graduates+with+Sun+onboard/2100-7344_3-5818473.html"><em>Apache Derby graduates with Sun onboard</em></a></td>
-
-</tr>
-
-<tr>
+</li>
-<td colspan="1" rowspan="1">31-July-2005</td>
- <td colspan="1" rowspan="1"> Web site moved from Incubator to DB Project.
- Pardon our dust while we update references
- throughout the Derby web site.
- </td>
-
-</tr>
-
-
-<tr>
+<li> 5-August-2005:
+ <a class="external" href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200508.mbox/%3c54ac72d70508031445298f855e@mail.gmail.com%3e">Derby 10.1.1 Release</a>
-<td colspan="1" rowspan="1">26-July-2005</td>
- <td colspan="1" rowspan="1"><a class="external" href="http://mail-archives.apache.org/mod_mbox/incubator-general/200507.mbox/%3c42E67D6F.8000009@debrunners.com%3e">The Incubator PMC voted
-in favor of graduating Derby to an Apache DB sub project.</a>
- </td>
-
-</tr>
-
-</table>
-</div>
-
-
-<a name="N100CE"></a><a name="Derby+Project+Charter"></a>
-<h2 class="boxed">Derby Project Charter</h2>
-<div class="section">
-<p>
-The Derby project develops open source database technology that is:
-</p>
-<ul>
-
-<li>Pure Java</li>
-
-<li>Easy to use</li>
-
-<li>Small footprint</li>
-
-<li>Standards based</li>
-
-<li>Secure</li>
-
-</ul>
-<a name="N100E8"></a><a name="Database+Technology"></a>
-<h3 class="boxed">Database Technology</h3>
-<p>
- Database technology is defined as software that processes data related
- requests from applications.
- Data requests include data definition, data modification and data retrieval.
- Database GUI tooling and IDEs are not developed by the Derby project.
- </p>
-<a name="N100F1"></a><a name="Pure+Java"></a>
-<h3 class="boxed">Pure Java</h3>
-<p>
- Derby technology is written in Java to take advantage of Java’s write
- once, run anywhere promise.
- Java platforms such as OSGi, J2ME, J2SE and J2EE are supported as appropriate.
- </p>
-<a name="N100FA"></a><a name="Easy+to+Use"></a>
-<h3 class="boxed">Easy to Use</h3>
-<p>
- Derby technology aims to be easy to use for software developers and zero administration for end users.
- </p>
-<a name="N10103"></a><a name="Small+Footprint"></a>
-<h3 class="boxed">Small Footprint</h3>
-<p>
- Derby technologies are designed to provide significant useful
- functionality in a small code size footprint with efficient runtime
- resource usage.
- </p>
-<a name="N1010C"></a><a name="Standards+based"></a>
-<h3 class="boxed">Standards based</h3>
-<p>
- Derby technology adheres to database standards such as JDBC
- and ANSI SQL standards.
- This means Derby provides the functionality expected of a modern relational
- database,
- including SQL syntax, transaction management, concurrency, triggers,
- and online backups.
- And it also means developers can later migrate to other databases if they
- so choose.
- </p>
-<a name="N10115"></a><a name="Secure"></a>
-<h3 class="boxed">Secure</h3>
-<p>
- Derby technology provides secure data management appropriate to environment
- the engine is executing in. Traditional enterprise database systems rely on
- the machine being physically protected (locked machine room) for security,
- Derby databases are often in unprotected environments, such as laptops and
- unattended hardware.
- </p>
-</div>
-
-
-<a name="N1011F"></a><a name="Derby+Technologies"></a>
-<h2 class="boxed">Derby Technologies</h2>
-<div class="section">
-<a name="N10124"></a><a name="Derby+embedded+database+engine"></a>
-<h3 class="boxed">Derby embedded database engine</h3>
-<p>
- The core of the technology, Derby’s database engine is a full
- functioned relational embedded database engine. JDBC and SQL are the
- programming APIs.
- </p>
-<a name="N1012D"></a><a name="Derby+network+server"></a>
-<h3 class="boxed">Derby network server</h3>
-<p>
- The Derby network server increases the reach of the Derby database
- engine by providing traditional client server functionality.
- The network server allows clients to connect over TCP/IP using the standard
- DRDA protocol.
- The network server allows the Derby engine to support networked JDBC,
- ODBC/CLI, Perl and PHP.
- </p>
-<a name="N10136"></a><a name="Database+Utilities"></a>
-<h3 class="boxed">Database Utilities</h3>
+</li>
+
+<li> 26-July-2005:
+ <a class="external" href="http://mail-archives.apache.org/mod_mbox/incubator-general/200507.mbox/%3c42E67D6F.8000009@debrunners.com%3e">The Incubator PMC voted in favor of graduating Derby to an Apache DB sub project.</a>
+
<ul>
-
-<li>
-<span class="codefrag">ij</span> -- a tool that allows SQL scripts to be executed
- against any JDBC database.
- </li>
-
+
<li>
-<span class="codefrag">dblook</span> -- Schema extraction tool for a Derby database.
- </li>
-
+<a class="external" href="http://pcweb.mycom.co.jp/news/2005/08/05/011.html"><em>Apache
+ Derby 10.1.1.0 Released - graduated from Apache Incubator</em></a> (Japanese)</li>
+
<li>
-<span class="codefrag">sysinfo</span> -- Utility to display version numbers and
- class path.
- </li>
-
+<a class="external" href="http://news.com.com/Apache+Derby+graduates+with+Sun+onboard/2100-7344_3-5818473.html"><em>Apache Derby graduates with Sun onboard</em></a> (English)</li>
+
</ul>
-</div>
-
+
+</li>
+
+<li>6-Dec-2004:
+ <a href="releases/release-10.0.2.1.html">Derby 10.0.2.1 Incubator Release</a>
+
+</li>
+
+<li>13-Nov-2004:
+ <a href="papers/ApacheCon.html">ApacheCon US 2004</a> had three
+ Derby sessions, a tutorial, and a code contest.
+ </li>
+
+<li> 3-August-2004:
+ <a class="external" href="http://mail-archives.apache.org/mod_mbox/incubator-general/200408.mbox/%3c410ED66D.2040309@apache.org%3e">DB PMC voted to sponsor Derby</a>
+ (see the <a href="derby_proposal.html">Derby Incubator proposal</a>)
+ </li>
-<a name="N10152"></a><a name="Derby+History"></a>
-<h2 class="boxed">Derby History</h2>
-<div class="section">
-<p>
-Cloudscape Inc, an Oakland, California start-up, was founded in 1996 to
-develop Java database technology. The first release of the database engine,
-then called JBMS, was in 1997.
-Subsequently the product was renamed Cloudscape and releases were made about
-every six months.
-In 1999 Informix Software, Inc., acquired Cloudscape, Inc.
-In 2001 IBM acquired the database assets of Informix Software,
-including Cloudscape.
-The database engine was re-branded to IBM Cloudscape and releases continued,
-mainly focussing on embedded use with IBM's Java products and middleware.
-In August 2004 IBM contributed the code to the Apache Software Foundation
-as Derby, an incubator project sponsored by the Apache DB project.
-In July 2005 Derby graduated from the Incubator into the Apache DB project.
-</p>
+</ul>
</div>
<p>
-<em>Last updated: 5-February-2006</em>
+<em>Last updated: 14-February-2006</em>
</p>
Modified: db/derby/site/trunk/build/site/license.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/license.html?rev=377932&r1=377931&r2=377932&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/license.html (original)
+++ db/derby/site/trunk/build/site/license.html Tue Feb 14 20:14:51 2006
@@ -60,19 +60,19 @@
<div onclick="SwitchMenu('menu_selected_1.1', 'skin/')" id="menu_selected_1.1Title" class="menutitle" style="background-image: url('skin/images/chapter_open.gif');">Derby</div>
<div id="menu_selected_1.1" class="selectedmenuitemgroup" style="display: block;">
<div class="menuitem">
-<a href="index.html">Welcome</a>
-</div>
-<div class="menupage">
-<div class="menupagetitle">License</div>
-</div>
-<div class="menuitem">
-<a href="derby_proposal.html">Proposal</a>
+<a href="index.html">Index</a>
</div>
<div class="menuitem">
<a href="faq.html">FAQs</a>
</div>
<div class="menuitem">
<a href="derby_downloads.html">Downloads</a>
+</div>
+<div class="menupage">
+<div class="menupagetitle">License</div>
+</div>
+<div class="menuitem">
+<a href="derby_charter.html">Charter</a>
</div>
</div>
<div class="searchbox">
Modified: db/derby/site/trunk/build/site/linkmap.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/linkmap.html?rev=377932&r1=377931&r2=377932&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/linkmap.html (original)
+++ db/derby/site/trunk/build/site/linkmap.html Tue Feb 14 20:14:51 2006
@@ -60,19 +60,19 @@
<div onclick="SwitchMenu('menu_1.1', 'skin/')" id="menu_1.1Title" class="menutitle">Derby</div>
<div id="menu_1.1" class="menuitemgroup">
<div class="menuitem">
-<a href="index.html">Welcome</a>
+<a href="index.html">Index</a>
</div>
<div class="menuitem">
-<a href="license.html">License</a>
+<a href="faq.html">FAQs</a>
</div>
<div class="menuitem">
-<a href="derby_proposal.html">Proposal</a>
+<a href="derby_downloads.html">Downloads</a>
</div>
<div class="menuitem">
-<a href="faq.html">FAQs</a>
+<a href="license.html">License</a>
</div>
<div class="menuitem">
-<a href="derby_downloads.html">Downloads</a>
+<a href="derby_charter.html">Charter</a>
</div>
</div>
<div onclick="SwitchMenu('menu_1.2', 'skin/')" id="menu_1.2Title" class="menutitle">Community</div>
@@ -558,31 +558,31 @@
<ul>
<li>
-<a href="index.html">Welcome</a> _________________________ <em>index</em>
+<a href="index.html">Index</a> _________________________ <em>index</em>
</li>
</ul>
<ul>
<li>
-<a href="license.html">License</a> _________________________ <em>license</em>
+<a href="faq.html">FAQs</a> _________________________ <em>faq</em>
</li>
</ul>
<ul>
<li>
-<a href="derby_proposal.html">Proposal</a> _________________________ <em>proposal</em>
+<a href="derby_downloads.html">Downloads</a> _________________________ <em>downloads</em>
</li>
</ul>
<ul>
<li>
-<a href="faq.html">FAQs</a> _________________________ <em>faq</em>
+<a href="license.html">License</a> _________________________ <em>license</em>
</li>
</ul>
<ul>
<li>
-<a href="derby_downloads.html">Downloads</a> _________________________ <em>downloads</em>
+<a href="derby_charter.html">Charter</a> _________________________ <em>charter</em>
</li>
</ul>
Modified: db/derby/site/trunk/build/site/papers/fortune_tut.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/papers/fortune_tut.html?rev=377932&r1=377931&r2=377932&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/papers/fortune_tut.html (original)
+++ db/derby/site/trunk/build/site/papers/fortune_tut.html Tue Feb 14 20:14:51 2006
@@ -60,19 +60,19 @@
<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Derby</div>
<div id="menu_1.1" class="menuitemgroup">
<div class="menuitem">
-<a href="../index.html">Welcome</a>
+<a href="../index.html">Index</a>
</div>
<div class="menuitem">
-<a href="../license.html">License</a>
+<a href="../faq.html">FAQs</a>
</div>
<div class="menuitem">
-<a href="../derby_proposal.html">Proposal</a>
+<a href="../derby_downloads.html">Downloads</a>
</div>
<div class="menuitem">
-<a href="../faq.html">FAQs</a>
+<a href="../license.html">License</a>
</div>
<div class="menuitem">
-<a href="../derby_downloads.html">Downloads</a>
+<a href="../derby_charter.html">Charter</a>
</div>
</div>
<div onclick="SwitchMenu('menu_1.2', '../skin/')" id="menu_1.2Title" class="menutitle">Community</div>
Modified: db/derby/site/trunk/build/site/releases/release-10.0.2.1.html
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/build/site/releases/release-10.0.2.1.html?rev=377932&r1=377931&r2=377932&view=diff
==============================================================================
--- db/derby/site/trunk/build/site/releases/release-10.0.2.1.html (original)
+++ db/derby/site/trunk/build/site/releases/release-10.0.2.1.html Tue Feb 14 20:14:51 2006
@@ -5,7 +5,7 @@
<meta content="Apache Forrest" name="Generator">
<meta name="Forrest-version" content="0.7">
<meta name="Forrest-skin-name" content="pelt">
-<title>Apache Derby 10.0.2.1 Release</title>
+<title>Apache Derby 10.0.2.1 Incubator Release</title>
<link type="text/css" href="../skin/basic.css" rel="stylesheet">
<link media="screen" type="text/css" href="../skin/screen.css" rel="stylesheet">
<link media="print" type="text/css" href="../skin/print.css" rel="stylesheet">
@@ -60,19 +60,19 @@
<div onclick="SwitchMenu('menu_1.1', '../skin/')" id="menu_1.1Title" class="menutitle">Derby</div>
<div id="menu_1.1" class="menuitemgroup">
<div class="menuitem">
-<a href="../index.html">Welcome</a>
+<a href="../index.html">Index</a>
</div>
<div class="menuitem">
-<a href="../license.html">License</a>
+<a href="../faq.html">FAQs</a>
</div>
<div class="menuitem">
-<a href="../derby_proposal.html">Proposal</a>
+<a href="../derby_downloads.html">Downloads</a>
</div>
<div class="menuitem">
-<a href="../faq.html">FAQs</a>
+<a href="../license.html">License</a>
</div>
<div class="menuitem">
-<a href="../derby_downloads.html">Downloads</a>
+<a href="../derby_charter.html">Charter</a>
</div>
</div>
<div class="searchbox">
@@ -94,7 +94,7 @@
<input value="-a" class="smallerfont" title="Shrink text" onclick="ndeSetTextSize('decr'); return false;" type="button">
<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
</div>
-<h1>Apache Derby 10.0.2.1 Release</h1>
+<h1>Apache Derby 10.0.2.1 Incubator Release</h1>
<div id="minitoc-area">
<ul class="minitoc">
<li>
Added: db/derby/site/trunk/src/documentation/content/xdocs/derby_charter.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/derby_charter.xml?rev=377932&view=auto
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/derby_charter.xml (added)
+++ db/derby/site/trunk/src/documentation/content/xdocs/derby_charter.xml Tue Feb 14 20:14:51 2006
@@ -0,0 +1,143 @@
+<?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 Project Charter</title>
+ </header>
+<body>
+
+<section><title>Derby Project Charter</title>
+<p>
+The Derby project develops open source database technology that is:
+</p>
+
+<ul>
+ <li>Pure Java</li>
+ <li>Easy to use</li>
+ <li>Small footprint</li>
+ <li>Standards based</li>
+ <li>Secure</li>
+</ul>
+
+ <section><title>Database Technology</title>
+ <p>
+ Database technology is defined as software that processes data related
+ requests from applications.
+ Data requests include data definition, data modification and data retrieval.
+ Database GUI tooling and IDEs are not developed by the Derby project.
+ </p>
+ </section>
+
+ <section><title>Pure Java</title>
+ <p>
+ Derby technology is written in Java to take advantage of Javaâs write
+ once, run anywhere promise.
+ Java platforms such as OSGi, J2ME, J2SE and J2EE are supported as appropriate.
+ </p>
+ </section>
+
+ <section><title>Easy to Use</title>
+ <p>
+ Derby technology aims to be easy to use for software developers and zero administration for end users.
+ </p>
+ </section>
+
+ <section><title>Small Footprint</title>
+ <p>
+ Derby technologies are designed to provide significant useful
+ functionality in a small code size footprint with efficient runtime
+ resource usage.
+ </p>
+ </section>
+
+ <section><title>Standards based</title>
+
+ <p>
+ Derby technology adheres to database standards such as JDBC
+ and ANSI SQL standards.
+ This means Derby provides the functionality expected of a modern relational
+ database,
+ including SQL syntax, transaction management, concurrency, triggers,
+ and online backups.
+ And it also means developers can later migrate to other databases if they
+ so choose.
+ </p>
+
+
+ </section>
+
+ <section><title>Secure</title>
+ <p>
+ Derby technology provides secure data management appropriate to environment
+ the engine is executing in. Traditional enterprise database systems rely on
+ the machine being physically protected (locked machine room) for security,
+ Derby databases are often in unprotected environments, such as laptops and
+ unattended hardware.
+ </p>
+ </section>
+
+</section>
+
+<section><title>Derby Technologies</title>
+
+ <section><title>Derby embedded database engine</title>
+ <p>
+ The core of the technology, Derbyâs database engine is a full
+ functioned relational embedded database engine. JDBC and SQL are the
+ programming APIs.
+ </p>
+ </section>
+
+ <section><title>Derby network server</title>
+ <p>
+ The Derby network server increases the reach of the Derby database
+ engine by providing traditional client server functionality.
+ The network server allows clients to connect over TCP/IP using the standard
+ DRDA protocol.
+ The network server allows the Derby engine to support networked JDBC,
+ ODBC/CLI, Perl and PHP.
+ </p>
+ </section>
+
+ <section><title>Database Utilities</title>
+ <ul>
+ <li> <code>ij</code> -- a tool that allows SQL scripts to be executed
+ against any JDBC database.
+ </li>
+ <li> <code>dblook</code> -- Schema extraction tool for a Derby database.
+ </li>
+ <li> <code>sysinfo</code> -- Utility to display version numbers and
+ class path.
+ </li>
+ </ul>
+ </section>
+
+</section>
+
+<section><title>Derby History</title>
+
+<p>
+Cloudscape Inc, an Oakland, California start-up, was founded in 1996 to
+develop Java database technology. The first release of the database engine,
+then called JBMS, was in 1997.
+Subsequently the product was renamed Cloudscape and releases were made about
+every six months.
+In 1999 Informix Software, Inc., acquired Cloudscape, Inc.
+In 2001 IBM acquired the database assets of Informix Software,
+including Cloudscape.
+The database engine was re-branded to IBM Cloudscape and releases continued,
+mainly focussing on embedded use with IBM's Java products and middleware.
+In August 2004 IBM contributed the code to the Apache Software Foundation
+as Derby, an Incubator project sponsored by the Apache DB project
+(<a href="derby_proposal.html">see the Incubator proposal</a>).
+In July 2005 Derby graduated from the Incubator into the Apache DB project.
+</p>
+
+</section>
+
+<p>
+<em>Last updated: 14-February-2006</em>
+</p>
+
+</body>
+</document>
Propchange: db/derby/site/trunk/src/documentation/content/xdocs/derby_charter.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/site/trunk/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/index.xml?rev=377932&r1=377931&r2=377932&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/index.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/index.xml Tue Feb 14 20:14:51 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>The Apache Derby Project</title>
+ <title>Apache Derby</title>
</header>
<body>
@@ -52,179 +52,42 @@
<section><title>News</title>
-<table>
-<tr>
- <td> 10-Dec-2005</td>
- <td> <a href="papers/ApacheCon.html">ApacheCon US 2005</a> had three
- Derby sessions.</td>
-</tr>
-<tr>
- <td> 18-Nov-2005</td>
- <td> <a href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200511.mbox/%3c54ac72d70511230905y39e3e894k697acbdf3da0ba51@mail.gmail.com%3e">Derby 10.1.2.1 Released.</a> </td>
-</tr>
-<tr>
- <td>5-August-2005</td>
- <td>Press release (Japan): <a href="http://pcweb.mycom.co.jp/news/2005/08/05/011.html"><em>Apache
- Derby 10.1.1.0 Released - graduated from Apache Incubator</em></a></td>
-</tr>
-<tr>
- <td> 5-August-2005</td>
- <td> <a href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200508.mbox/%3c54ac72d70508031445298f855e@mail.gmail.com%3e">Derby 10.1.1 Released.</a>
- </td>
-</tr>
-
-<tr>
- <td> 4-August-2005</td>
- <td> Press release (U.S.): <a href="http://news.com.com/Apache+Derby+graduates+with+Sun+onboard/2100-7344_3-5818473.html"><em>Apache Derby graduates with Sun onboard</em></a></td>
-</tr>
-<tr>
- <td>31-July-2005</td>
- <td> Web site moved from Incubator to DB Project.
- Pardon our dust while we update references
- throughout the Derby web site.
- </td>
-</tr>
-
-<tr>
- <td>26-July-2005</td>
- <td><a href="http://mail-archives.apache.org/mod_mbox/incubator-general/200507.mbox/%3c42E67D6F.8000009@debrunners.com%3e">The Incubator PMC voted
-in favor of graduating Derby to an Apache DB sub project.</a>
- </td>
-</tr>
-</table>
-
-</section>
-
-<section><title>Derby Project Charter</title>
-<p>
-The Derby project develops open source database technology that is:
-</p>
-
<ul>
- <li>Pure Java</li>
- <li>Easy to use</li>
- <li>Small footprint</li>
- <li>Standards based</li>
- <li>Secure</li>
+ <li> 10-Dec-2005:
+ <a href="papers/ApacheCon.html">ApacheCon US 2005</a> had three
+ Derby sessions.
+ </li>
+ <li> 18-Nov-2005:
+ <a href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200511.mbox/%3c54ac72d70511230905y39e3e894k697acbdf3da0ba51@mail.gmail.com%3e">Derby 10.1.2.1 Release</a>
+ </li>
+ <li> 5-August-2005:
+ <a href="http://mail-archives.apache.org/mod_mbox/db-derby-user/200508.mbox/%3c54ac72d70508031445298f855e@mail.gmail.com%3e">Derby 10.1.1 Release</a>
+ </li>
+ <li> 26-July-2005:
+ <a href="http://mail-archives.apache.org/mod_mbox/incubator-general/200507.mbox/%3c42E67D6F.8000009@debrunners.com%3e">The Incubator PMC voted in favor of graduating Derby to an Apache DB sub project.</a>
+ <ul>
+ <li> <a href="http://pcweb.mycom.co.jp/news/2005/08/05/011.html"><em>Apache
+ Derby 10.1.1.0 Released - graduated from Apache Incubator</em></a> (Japanese)</li>
+ <li> <a href="http://news.com.com/Apache+Derby+graduates+with+Sun+onboard/2100-7344_3-5818473.html"><em>Apache Derby graduates with Sun onboard</em></a> (English)</li>
+ </ul>
+ </li>
+ <li>6-Dec-2004:
+ <a href="releases/release-10.0.2.1.html">Derby 10.0.2.1 Incubator Release</a>
+ </li>
+ <li>13-Nov-2004:
+ <a href="papers/ApacheCon.html">ApacheCon US 2004</a> had three
+ Derby sessions, a tutorial, and a code contest.
+ </li>
+ <li> 3-August-2004:
+ <a href="http://mail-archives.apache.org/mod_mbox/incubator-general/200408.mbox/%3c410ED66D.2040309@apache.org%3e">DB PMC voted to sponsor Derby</a>
+ (see the <a href="derby_proposal.html">Derby Incubator proposal</a>)
+ </li>
</ul>
- <section><title>Database Technology</title>
- <p>
- Database technology is defined as software that processes data related
- requests from applications.
- Data requests include data definition, data modification and data retrieval.
- Database GUI tooling and IDEs are not developed by the Derby project.
- </p>
- </section>
-
- <section><title>Pure Java</title>
- <p>
- Derby technology is written in Java to take advantage of Javaâs write
- once, run anywhere promise.
- Java platforms such as OSGi, J2ME, J2SE and J2EE are supported as appropriate.
- </p>
- </section>
-
- <section><title>Easy to Use</title>
- <p>
- Derby technology aims to be easy to use for software developers and zero administration for end users.
- </p>
- </section>
-
- <section><title>Small Footprint</title>
- <p>
- Derby technologies are designed to provide significant useful
- functionality in a small code size footprint with efficient runtime
- resource usage.
- </p>
- </section>
-
- <section><title>Standards based</title>
-
- <p>
- Derby technology adheres to database standards such as JDBC
- and ANSI SQL standards.
- This means Derby provides the functionality expected of a modern relational
- database,
- including SQL syntax, transaction management, concurrency, triggers,
- and online backups.
- And it also means developers can later migrate to other databases if they
- so choose.
- </p>
-
-
- </section>
-
- <section><title>Secure</title>
- <p>
- Derby technology provides secure data management appropriate to environment
- the engine is executing in. Traditional enterprise database systems rely on
- the machine being physically protected (locked machine room) for security,
- Derby databases are often in unprotected environments, such as laptops and
- unattended hardware.
- </p>
- </section>
-
-</section>
-
-<section><title>Derby Technologies</title>
-
- <section><title>Derby embedded database engine</title>
- <p>
- The core of the technology, Derbyâs database engine is a full
- functioned relational embedded database engine. JDBC and SQL are the
- programming APIs.
- </p>
- </section>
-
- <section><title>Derby network server</title>
- <p>
- The Derby network server increases the reach of the Derby database
- engine by providing traditional client server functionality.
- The network server allows clients to connect over TCP/IP using the standard
- DRDA protocol.
- The network server allows the Derby engine to support networked JDBC,
- ODBC/CLI, Perl and PHP.
- </p>
- </section>
-
- <section><title>Database Utilities</title>
- <ul>
- <li> <code>ij</code> -- a tool that allows SQL scripts to be executed
- against any JDBC database.
- </li>
- <li> <code>dblook</code> -- Schema extraction tool for a Derby database.
- </li>
- <li> <code>sysinfo</code> -- Utility to display version numbers and
- class path.
- </li>
- </ul>
- </section>
-
-</section>
-
-<section><title>Derby History</title>
-
-<p>
-Cloudscape Inc, an Oakland, California start-up, was founded in 1996 to
-develop Java database technology. The first release of the database engine,
-then called JBMS, was in 1997.
-Subsequently the product was renamed Cloudscape and releases were made about
-every six months.
-In 1999 Informix Software, Inc., acquired Cloudscape, Inc.
-In 2001 IBM acquired the database assets of Informix Software,
-including Cloudscape.
-The database engine was re-branded to IBM Cloudscape and releases continued,
-mainly focussing on embedded use with IBM's Java products and middleware.
-In August 2004 IBM contributed the code to the Apache Software Foundation
-as Derby, an incubator project sponsored by the Apache DB project.
-In July 2005 Derby graduated from the Incubator into the Apache DB project.
-</p>
-
</section>
<p>
-<em>Last updated: 5-February-2006</em>
+<em>Last updated: 14-February-2006</em>
</p>
</body>
Modified: db/derby/site/trunk/src/documentation/content/xdocs/releases/release-10.0.2.1.xml
URL: http://svn.apache.org/viewcvs/db/derby/site/trunk/src/documentation/content/xdocs/releases/release-10.0.2.1.xml?rev=377932&r1=377931&r2=377932&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/releases/release-10.0.2.1.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/releases/release-10.0.2.1.xml Tue Feb 14 20:14:51 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 10.0.2.1 Release</title>
+ <title>Apache Derby 10.0.2.1 Incubator Release</title>
</header>
<body>
<section>
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=377932&r1=377931&r2=377932&view=diff
==============================================================================
--- db/derby/site/trunk/src/documentation/content/xdocs/site.xml (original)
+++ db/derby/site/trunk/src/documentation/content/xdocs/site.xml Tue Feb 14 20:14:51 2006
@@ -3,11 +3,11 @@
xmlns="http://apache.org/forrest/linkmap/1.0" tab="home">
<about label="Derby" tab="home">
- <index label="Welcome" href="index.html"/>
- <license label="License" href="license.html"/>
- <proposal label="Proposal" href="derby_proposal.html"/>
+ <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"/>
</about>
<community label="Community" tab="community">