db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r111464 - in incubator/derby/site/trunk: build/site build/site/images build/site/papers src/documentation/content/xdocs src/documentation/content/xdocs/papers src/documentation/resources/images
Date Fri, 10 Dec 2004 04:16:54 GMT
Author: jta
Date: Thu Dec  9 20:16:53 2004
New Revision: 111464

URL: http://svn.apache.org/viewcvs?view=rev&rev=111464
Log:
Committed Susan Cline's logo_contest page changes.
Updated derby_web with info about adding new files.
Cleaned up formatting in JDBCImplementation.ihtml.

Added:
   incubator/derby/site/trunk/build/site/images/logo_entry_2.gif   (contents, props changed)
   incubator/derby/site/trunk/build/site/images/logo_entry_3.gif   (contents, props changed)
   incubator/derby/site/trunk/build/site/images/logo_entry_4.JPG   (contents, props changed)
   incubator/derby/site/trunk/build/site/images/logo_entry_5.jpg   (contents, props changed)
   incubator/derby/site/trunk/src/documentation/resources/images/logo_entry_2.gif   (contents, props changed)
   incubator/derby/site/trunk/src/documentation/resources/images/logo_entry_3.gif   (contents, props changed)
   incubator/derby/site/trunk/src/documentation/resources/images/logo_entry_4.JPG   (contents, props changed)
   incubator/derby/site/trunk/src/documentation/resources/images/logo_entry_5.jpg   (contents, props changed)
Modified:
   incubator/derby/site/trunk/build/site/derby_downloads.html
   incubator/derby/site/trunk/build/site/logo_contest.html
   incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html
   incubator/derby/site/trunk/build/site/papers/derby_web.html
   incubator/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml
   incubator/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml
   incubator/derby/site/trunk/src/documentation/content/xdocs/papers/JDBCImplementation.ihtml
   incubator/derby/site/trunk/src/documentation/content/xdocs/papers/derby_web.xml

Modified: incubator/derby/site/trunk/build/site/derby_downloads.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/derby_downloads.html?view=diff&rev=111464&p1=incubator/derby/site/trunk/build/site/derby_downloads.html&r1=111463&p2=incubator/derby/site/trunk/build/site/derby_downloads.html&r2=111464
==============================================================================
--- incubator/derby/site/trunk/build/site/derby_downloads.html	(original)
+++ incubator/derby/site/trunk/build/site/derby_downloads.html	Thu Dec  9 20:16:53 2004
@@ -331,12 +331,12 @@
 
 </p>
 <p>
-Check out the 10.0 branch:
+To check out the 10.0 branch:
 </p>
 <pre class="code">svn co http://svn.apache.org/repos/asf/incubator/derby/code/branches/10.0/
 </pre>
 <p>
-Check out the development trunk:
+To check out the development trunk:
 </p>
 <pre class="code">svn checkout http://svn.apache.org/repos/asf/incubator/derby/code/trunk/</pre>
 <p>
@@ -553,7 +553,7 @@
 
 <p>
 
-<em>Last updated: Dec 6, 2004</em>
+<em>Last updated: Dec 9, 2004</em>
 
 </p>
 

Added: incubator/derby/site/trunk/build/site/images/logo_entry_2.gif
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/images/logo_entry_2.gif?view=auto&rev=111464
==============================================================================
Binary file. No diff available.

Added: incubator/derby/site/trunk/build/site/images/logo_entry_3.gif
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/images/logo_entry_3.gif?view=auto&rev=111464
==============================================================================
Binary file. No diff available.

Added: incubator/derby/site/trunk/build/site/images/logo_entry_4.JPG
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/images/logo_entry_4.JPG?view=auto&rev=111464
==============================================================================
Binary file. No diff available.

Added: incubator/derby/site/trunk/build/site/images/logo_entry_5.jpg
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/images/logo_entry_5.jpg?view=auto&rev=111464
==============================================================================
Binary file. No diff available.

Modified: incubator/derby/site/trunk/build/site/logo_contest.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/logo_contest.html?view=diff&rev=111464&p1=incubator/derby/site/trunk/build/site/logo_contest.html&r1=111463&p2=incubator/derby/site/trunk/build/site/logo_contest.html&r2=111464
==============================================================================
--- incubator/derby/site/trunk/build/site/logo_contest.html	(original)
+++ incubator/derby/site/trunk/build/site/logo_contest.html	Thu Dec  9 20:16:53 2004
@@ -311,13 +311,54 @@
 
 </tr>
 
+
+<tr>
+
+<td colspan="1" rowspan="1"><img alt="entry_2" height="146" src="images/logo_entry_2.gif" width="233"></td>
+<td colspan="1" rowspan="1">Ken Coar</td>
+<td colspan="1" rowspan="1"></td>
+<td colspan="1" rowspan="1"><a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&msgNo=295">2</a></td>
+
+</tr>
+
+
+<tr>
+
+<td colspan="1" rowspan="1"><img alt="entry_3" height="175" src="images/logo_entry_3.gif" width="247"></td>
+<td colspan="1" rowspan="1">Ken Coar</td>
+<td colspan="1" rowspan="1"></td>
+<td colspan="1" rowspan="1"><a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&msgNo=300">3</a></td>
+
+</tr>
+
+
+<tr>
+
+<td colspan="1" rowspan="1"><img alt="entry_4" height="92" src="images/logo_entry_4.JPG" width="327"></td>
+<td colspan="1" rowspan="1">Army</td>
+<td colspan="1" rowspan="1"></td>
+<td colspan="1" rowspan="1"><a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&msgNo=299">4</a></td>
+
+</tr>
+
+
+<tr>
+
+<td colspan="1" rowspan="1"><img alt="entry_5" height="154" src="images/logo_entry_5.jpg" width="231"></td>
+<td colspan="1" rowspan="1">Adam Blinkinsop</td>
+<td colspan="1" rowspan="1"></td>
+<td colspan="1" rowspan="1"><a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&msgNo=289">5</a></td>
+
+</tr>
+
+
 </table>
 </div>
 
 
 <p>
 
-<em>Last updated: Dec 8, 2004</em>
+<em>Last updated: Dec 9, 2004</em>
 
 </p>
 

Modified: incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html?view=diff&rev=111464&p1=incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html&r1=111463&p2=incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html&r2=111464
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html	(original)
+++ incubator/derby/site/trunk/build/site/papers/JDBCImplementation.html	Thu Dec  9 20:16:53 2004
@@ -235,36 +235,70 @@
 </table>
 <ul class="minitoc">
 <li>
-<a href="#Derby+JDBC+Implementation+Notes">Derby JDBC Implementation Notes</a>
+<a href="#Overview">Overview</a>
+</li>
+<li>
+<a href="#Java.sql.ResultSet">Java.sql.ResultSet</a>
 <ul class="minitoc">
 <li>
-<a href="#%3FOverview">&nbsp;Overview</a>
+<a href="#GetAsciiStream%28%29">GetAsciiStream()</a>
 </li>
 <li>
-<a href="#Java.sql.ResultSet">Java.sql.ResultSet</a>
+<a href="#GetBinaryStream%28%29">GetBinaryStream()</a>
+</li>
+<li>
+<a href="#GetCharacterStream%28%29">GetCharacterStream()</a>
+</li>
+<li>
+<a href="#GetString%28%29">GetString()</a>
+</li>
+<li>
+<a href="#GetUnicodeStream%28%29">GetUnicodeStream()</a>
+</li>
+<li>
+<a href="#Examples">Examples</a>
 </li>
 </ul>
 </li>
 <li>
-<a href="#Binary+Column">Binary Column</a>
+<a href="#java.sql.Blob">java.sql.Blob</a>
 <ul class="minitoc">
 <li>
-<a href="#java.sql.Blob">java.sql.Blob</a>
+<a href="#getBytes%28int+pos%2C+int+length%29">getBytes(int pos, int length)</a>
+</li>
+<li>
+<a href="#position%28byte+pattern%2C+int+start%29+andand+position%28Blob+pattern%2C+int+start%29">position(byte pattern, int start) andand position(Blob pattern, int start)</a>
+</li>
+</ul>
 </li>
 <li>
 <a href="#java.sql.Clob">java.sql.Clob</a>
+<ul class="minitoc">
+<li>
+<a href="#getSubString%28int+pos%2C+int+length%29">getSubString(int pos, int length)</a>
+</li>
+<li>
+<a href="#position%28String+searchstr%2C+int+start%29+and">position(String searchstr, int start) andposition(Clob searchstr, int start)</a>
+</li>
+</ul>
 </li>
 <li>
 <a href="#Date+Handling">Date Handling</a>
+<ul class="minitoc">
+<li>
+<a href="#Derby+SQL+DATE">Derby SQL DATE</a>
+</li>
+<li>
+<a href="#Derby+SQL+TIME">Derby SQL TIME</a>
+</li>
+<li>
+<a href="#Derby+SQL+TIMESTAMP">Derby SQL TIMESTAMP</a>
 </li>
 </ul>
 </li>
 </ul>
-<a name="N10052"></a><a name="Derby+JDBC+Implementation+Notes"></a>
-<h3>Derby JDBC Implementation Notes</h3>
-<div style="margin-left: 0 ; border: 2px">
-<a name="N10056"></a><a name="%3FOverview"></a>
-<h4>&nbsp;Overview</h4>
+<a name="N10049"></a><a name="Overview"></a>
+<h3>Overview</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>The JDBC specification is sometimes unclear or contradictory. This document covers how Derby implements some JDBC features where the specification might be unclear.</p>
 <p>The JDBC 3.0 specicification is in theory a single document however clarifications or addiitonal information can also be found in the Javadoc for java.sql and javax.sql, and in the offical JDBC tutorial book.</p>
@@ -275,148 +309,154 @@
 <p>[TUTORIAL3] &ndash; JDBC API Tutorial and Reference, Third Edition. ISBN 0321173848 <a href="http://java.sun.com/developer/Books/jdbc/Fisher/index.html">http://java.sun.com/developer/Books/jdbc/Fisher/index.html</a>
 </p>
 </div>
-<a name="N1006D"></a><a name="Java.sql.ResultSet"></a>
-<h4>Java.sql.ResultSet</h4>
+<a name="N10060"></a><a name="Java.sql.ResultSet"></a>
+<h3>Java.sql.ResultSet</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Support for data conversion using the getXXX() methods matches Table B-6 in the [JDBC3], with some extensions described below.</p>
-<p>
-<strong>Extension -</strong> If the value column is null, then generally any getXXX method can be used to fetch the null value and a null or a representation of zero will be returned and a subsequent call to wasNull() will return true. It is not recommended that applications take advantage of this liberal conversion of SQL NULL values, use of a getXXX() method that works against NULL and non-NULL values is strongly recommended.</p>
-<a name="N10077"></a><a name="getAsciiStream%28%29"></a>
-<h5>getAsciiStream()</h5>
+<p>ExtensionExtension</p>
+<p>If the value column is null, then generally any getXXX method can be used to fetch the null value and a null or a representation of zero will be returned and a subsequent call to wasNull() will return true. It is not recommended that applications take advantage of this liberal conversion of SQL NULL values, use of a getXXX() method that works against NULL and non-NULL values is strongly recommended.</p>
+<a name="N1006A"></a><a name="GetAsciiStream%28%29"></a>
+<h4>GetAsciiStream()</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <strong>Behavior Clarification</strong>
-</p>
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; An ASCII character is defined as an eight bit character (range 0x00 to 0xff), see CHAR() function definition by [JDBC3] in appendix C.2.</p>
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; For character types&nbsp; (Types.CHAR, Types.VARCHAR &amp;amp; Types.LONGVARCHAR) &ndash; Each character in the value is translated to one byte in the ASCII stream, For Unicode characters in the range 0x0000 to 0x00ff, they are translated to a byte with the matching value (0x00 to 0xff). Characters outside this range, (0x0100 to 0xffff) are translated to 0x3f (&lsquo;?&rsquo;).</p>
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; For binary types (Types.BINARY, Types.VARBINARY, and Types.LONGVARBINARY) getAsciiStream() returns a stream with identical contents to that returned by getBinaryStream() on the same column.</p>
-<p>&nbsp;</p>
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <strong>Extensions</strong>
-</p>
-<p>&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; On Types.CLOB columns returns a stream with identical contents to that returned by getClob().getAsciiStream() on the same column if the CLOB value is not NULL. If the CLOB value is NULL then null is returned.</p>
-<p>&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; On Types.BLOB columns returns a stream with identical contents to that returned by getBlob().getBinaryStream() on the same column if the BLOB value is not NULL. If the BLOB value is NULL then null is returned.</p>
-<p>&nbsp;</p>
+<p>Behavior Clarification</p>
+<p>An ASCII character is defined as an eight bit character (range 0x00 to 0xff), see CHAR() function definition by [JDBC3] in appendix C.2.</p>
+<p>For character types (Types.CHAR, Types.VARCHAR &amp;amp; Types.LONGVARCHAR) &ndash; Each character in the value is translated to one byte in the ASCII stream, For Unicode characters in the range 0x0000 to 0x00ff, they are translated to a byte with the matching value (0x00 to 0xff). Characters outside this range, (0x0100 to 0xffff) are translated to 0x3f (&lsquo;?&rsquo;).</p>
+<p>For binary types (Types.BINARY, Types.VARBINARY, and Types.LONGVARBINARY) getAsciiStream() returns a stream with identical contents to that returned by getBinaryStream() on the same column.</p>
+<p>Extensions</p>
+<ul>
+<li>
+<p>On Types.CLOB columns returns a stream with identical contents to that returned by getClob().getAsciiStream() on the same column if the CLOB value is not NULL. If the CLOB value is NULL then null is returned.</p>
+</li>
+</ul>
+<ul>
+<li>
+<p>On Types.BLOB columns returns a stream with identical contents to that returned by getBlob().getBinaryStream() on the same column if the BLOB value is not NULL. If the BLOB value is NULL then null is returned.</p>
+</li>
+</ul>
 </div>
-<a name="N10091"></a><a name="getBinaryStream%28%29"></a>
-<h5>getBinaryStream()</h5>
+<a name="N10080"></a><a name="GetBinaryStream%28%29"></a>
+<h4>GetBinaryStream()</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <strong>Extensions</strong>
-</p>
-<p>&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; On Types.BLOB columns returns a stream with identical contents to that returned by getBlob().getBinaryStream() on the same column if the BLOB value is not NULL. If the BLOB value is NULL then null is returned.</p>
-<p>&nbsp;</p>
+<p>Extensions</p>
+<p>On Types.BLOB columns returns a stream with identical contents to that returned by getBlob().getBinaryStream() on the same column if the BLOB value is not NULL. If the BLOB value is NULL then null is returned.</p>
 </div>
-<a name="N1009D"></a><a name="getCharacterStream%28%29"></a>
-<h5>getCharacterStream()</h5>
+<a name="N10088"></a><a name="GetCharacterStream%28%29"></a>
+<h4>GetCharacterStream()</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <strong>Behavior Clarification</strong>
-</p>
+<p>Behavior Clarification</p>
 <p>For binary types (Types.BINARY, Types.VARBINARY, and Types.LONGVARBINARY, Types.BLOB) getString() the value is converted to a stream of characters as though it is encoded using UTF-16BE.</p>
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <strong>Extensions</strong>
-</p>
-<p>&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; On Types.CLOB columns returns a reader with identical contents to that returned by getClob().getCharacterStream() on the same column if the CLOB value is not NULL. If the CLOB value is NULL then null is returned.</p>
-<p>&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; On Types.BLOB columns supported with conversion as a binary type.</p>
+<p>Extensions</p>
+<ul>
+<li>
+<p>On Types.CLOB columns returns a reader with identical contents to that returned by getClob().getCharacterStream() on the same column if the CLOB value is not NULL. If the CLOB value is NULL then null is returned.</p>
+</li>
+</ul>
+<ul>
+<li>
+<p>On Types.BLOB columns supported with conversion as a binary type.</p>
+</li>
+</ul>
 </div>
-<a name="N100AF"></a><a name="getString%28%29"></a>
-<h5>getString()</h5>
+<a name="N1009A"></a><a name="GetString%28%29"></a>
+<h4>GetString()</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <strong>Behavior Clarification</strong>
-</p>
+<p>Behavior Clarification</p>
 <p>For binary types (Types.BINARY, Types.VARBINARY, and Types.LONGVARBINARY, Types.BLOB) getString() returns String containing a two character hexadecimal representation for every byte in a non-null value.&nbsp; The two characters are in the range &lsquo;0&rsquo; &ndash; &lsquo;9&rsquo; and &lsquo;a&rsquo; &ndash; &lsquo;f&rsquo;. For NULL values, null is returned. Note, that this String does not match the contents of the stream returned by getAsciiStream or getCharacterStream on the same column.</p>
-<p>&nbsp;</p>
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <strong>Extensions</strong>
-</p>
-<p>&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; On Types.CLOB columns returns a String representing the contents of the CLOB value is not NULL. If the CLOB value is NULL then null is returned.</p>
-<p>&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; On Types.BLOB columns supported with conversion as a binary type.</p>
+<p>Extensions</p>
+<ul>
+<li>
+<p>On Types.CLOB columns returns a String representing the contents of the CLOB value is not NULL. If the CLOB value is NULL then null is returned.</p>
+</li>
+</ul>
+<ul>
+<li>
+<p>On Types.BLOB columns supported with conversion as a binary type.</p>
+</li>
+</ul>
 </div>
-<a name="N100C3"></a><a name="getUnicodeStream%28%29"></a>
-<h5>getUnicodeStream()</h5>
+<a name="N100AC"></a><a name="GetUnicodeStream%28%29"></a>
+<h4>GetUnicodeStream()</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>Not implemented, deprecated by [JDBC3].</p>
 </div>
-<a name="N100C9"></a><a name="Examples"></a>
-<h5>Examples</h5>
-<div style="margin-left: 0 ; border: 2px"></div>
-</div>
-</div>
-<a name="N100CD"></a><a name="Binary+Column"></a>
-<h3>Binary Column</h3>
+<a name="N100B2"></a><a name="Examples"></a>
+<h4>Examples</h4>
 <div style="margin-left: 0 ; border: 2px">
+<p>Binary Column</p>
 <p>If a binary column has been set with the Java byte array containing fours bytes, byte[] data = {0x34, 0x87, 0xc2, 0x1f} then:</p>
-<p>&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; getBinaryStream() returns a java.io.InputStream containing four bytes - 0x34, 0x87, 0xc2, 0x1f</p>
-<p>&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; getAsciiStream() returns a java.io.InputStream containing four bytes -&nbsp; 0x34, 0x87, 0xc2, 0x1f&nbsp; [ same as getBinaryStream() ]</p>
-<p>&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; getCharacterStream() returns a java.io.Reader containing two characters - 0x3487, 0xc21f</p>
-<p>&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; getString() returns a String with eight characters &ldquo;3487c21f&rdquo;</p>
-<a name="N100DB"></a><a name="java.sql.Blob"></a>
-<h4>java.sql.Blob</h4>
+<ul>
+<li>
+<p>getBinaryStream() returns a java.io.InputStream containing four bytes - 0x34, 0x87, 0xc2, 0x1f</p>
+</li>
+</ul>
+<ul>
+<li>
+<p>getAsciiStream() returns a java.io.InputStream containing four bytes -&nbsp; 0x34, 0x87, 0xc2, 0x1f&nbsp; [ same as getBinaryStream() ]</p>
+</li>
+</ul>
+<ul>
+<li>
+<p>getCharacterStream() returns a java.io.Reader containing two characters - 0x3487, 0xc21f</p>
+</li>
+<li>
+<p>getString() returns a String with eight characters &ldquo;3487c21f&rdquo;</p>
+</li>
+</ul>
+</div>
+</div>
+<a name="N100C9"></a><a name="java.sql.Blob"></a>
+<h3>java.sql.Blob</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N100DF"></a><a name="getBytes%28int+pos%2C+int+length%29"></a>
-<h5>getBytes(int pos, int length)</h5>
+<a name="N100CD"></a><a name="getBytes%28int+pos%2C+int+length%29"></a>
+<h4>getBytes(int pos, int length)</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <strong>Behavior Clarification</strong>
-</p>
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; If the pos (position) argument is greater than the length of the BLOB then an exception is thrown. This matches the semantics of the SQL SUBSTR function.</p>
+<p>Behavior Clarification</p>
+<p>If the pos (position) argument is greater than the length of the BLOB then an exception is thrown. This matches the semantics of the SQL SUBSTR function.</p>
 </div>
-<a name="N100E9"></a><a name="position%28byte+pattern%2C+int+start%29"></a>
-<h5>position(byte pattern, int start)position(Blob pattern, int start)</h5>
+<a name="N100D5"></a><a name="position%28byte+pattern%2C+int+start%29+andand+position%28Blob+pattern%2C+int+start%29"></a>
+<h4>position(byte pattern, int start) andand position(Blob pattern, int start)</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <strong>Behavior Clarification</strong>
-</p>
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; If the pattern argument has length zero, then the value of start argument will be returned. This matches the semantics of the SQL LOCATE function.</p>
+<p>Behavior Clarification</p>
+<p>If the pattern argument has length zero, then the value of start argument will be returned. This matches the semantics of the SQL LOCATE function.</p>
 </div>
 </div>
-<a name="N100F5"></a><a name="java.sql.Clob"></a>
-<h4>java.sql.Clob</h4>
+<a name="N100DD"></a><a name="java.sql.Clob"></a>
+<h3>java.sql.Clob</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N100F9"></a><a name="getSubString%28int+pos%2C+int+length%29"></a>
-<h5>getSubString(int pos, int length)</h5>
+<a name="N100E1"></a><a name="getSubString%28int+pos%2C+int+length%29"></a>
+<h4>getSubString(int pos, int length)</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <strong>Behavior Clarification</strong>
-</p>
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; If the pos (position) argument is greater than the length of the CLOB then an exception is thrown. This matches the semantics of the SQL SUBSTR function.</p>
+<p>Behavior Clarification</p>
+<p>If the pos (position) argument is greater than the length of the CLOB then an exception is thrown. This matches the semantics of the SQL SUBSTR function.</p>
 </div>
-<a name="N10103"></a><a name="position%28String+searchstr%2C+int+start%29"></a>
-<h5>position(String searchstr, int start)position(Clob searchstr, int start)</h5>
+<a name="N100E9"></a><a name="position%28String+searchstr%2C+int+start%29+and"></a>
+<h4>position(String searchstr, int start) andposition(Clob searchstr, int start)</h4>
 <div style="margin-left: 0 ; border: 2px">
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <strong>Behavior Clarification</strong>
-</p>
-<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; If the searchstr argument has length zero (the empty string), then the value of start argument will be returned. This matches the semantics of the SQL LOCATE function.</p>
+<p>Behavior Clarification</p>
+<p>If the searchstr argument has length zero (the empty string), then the value of start argument will be returned. This matches the semantics of the SQL LOCATE function.</p>
 </div>
 </div>
-<a name="N1010F"></a><a name="Date+Handling"></a>
-<h4>Date Handling</h4>
+<a name="N100F3"></a><a name="Date+Handling"></a>
+<h3>Date Handling</h3>
 <div style="margin-left: 0 ; border: 2px">
-<a name="N10113"></a><a name="Derby+SQL+DATE"></a>
-<h5>Derby SQL DATE</h5>
+<a name="N100F7"></a><a name="Derby+SQL+DATE"></a>
+<h4>Derby SQL DATE</h4>
 <div style="margin-left: 0 ; border: 2px">
-<ul>
-<li>
 <p>Derby&rsquo;s SQL DATE type represents a date in the form yyyy-mm-dd with no associated time zone information.</p>
-</li>
-</ul>
-</div>
-<a name="N1011B"></a><a name="java.sql.Date"></a>
+<a name="N100FD"></a><a name="java.sql.Date"></a>
 <h5>java.sql.Date</h5>
 <div style="margin-left: 0 ; border: 2px">
-<ul>
-<li>
 <p>A JDBC Date (java.sql.Date) by definition represents a point in time on a given date in a given time zone.</p>
-</li>
-<li>
 <p>[JDBC3] intends that the point in time for a java.sql.Date object is 00:00 (midnight), but this is not enforced by the class.</p>
-</li>
-<li>
 <p>JDBC drivers are required to return java.sql.Date objects that are normalized to 00:00 according to the required time zone.</p>
-</li>
-<li>
 <p>Applications are expected to pass in java.sql.Date instances that are normalized to 00:00 (see section 18.1.1 of [TUTORIAL3]).</p>
-</li>
-</ul>
 </div>
-<a name="N1012C"></a><a name="Conversion+of+a+JDBC+java.sql.Date+to+a+Derby+DATE+value"></a>
+<a name="N10109"></a><a name="Conversion+of+a+JDBC+java.sql.Date+to+a+Derby+DATE+value"></a>
 <h5>Conversion of a JDBC java.sql.Date to a Derby DATE value</h5>
 <div style="margin-left: 0 ; border: 2px">
 <ol>
 <li>
-<p>setDate() without a Calendar object or passing null for a Calendar object</p>
+<p>setDate() without a Calendar object or passing null for a Calendar object:</p>
 <ul>
 <li>
 <p>The yyyy-mm-dd values will be calculated from the milli-seconds value of the java.sql.Date instance using a Calendar object set to the time zone of the virtual machine.</p>
@@ -427,7 +467,7 @@
 </ul>
 </li>
 <li>
-<p>setDate() with a Calendar object</p>
+<p>setDate() with a Calendar object:</p>
 <ul>
 <li>
 <p>The yyyy-mm-dd values will be calculated from the milliseconds value of the java.sql.Date instance using the passed in Calendar.</p>
@@ -444,12 +484,12 @@
 <p>Derby does not require that the application&rsquo;s java.sql.Date value is normalized to 00:00 according to the required time zone.</p>
 <p>In both cases no time zone information is stored with the SQL DATE value.</p>
 </div>
-<a name="N10154"></a><a name="Conversion+of+a+Derby+DATE+value+to+a+JDBC+java.sql.Date"></a>
+<a name="N10131"></a><a name="Conversion+of+a+Derby+DATE+value+to+a+JDBC+java.sql.Date"></a>
 <h5>Conversion of a Derby DATE value to a JDBC java.sql.Date</h5>
 <div style="margin-left: 0 ; border: 2px">
-<ul>
+<ol>
 <li>
-<p>getDate() without a Calendar object or passing null for a Calendar object</p>
+<p>getDate() without a Calendar object or passing null for a Calendar object:</p>
 <ul>
 <li>
 <p>A java.sql.Date instance is returned with a millisecond value corresponding to 00:00 on yyyy-mm-dd according to the time zone of the java virtual machine</p>
@@ -460,73 +500,55 @@
 </ul>
 </li>
 <li>
-<p>getDate() with a Calendar object</p>
+<p>getDate() with a Calendar object:</p>
 <ul>
 <li>
 <p>A java.sql.Date instance is returned with a millisecond value corresponding to 00:00 on yyyy-mm-dd according to the time zone of the Calendar</p>
 </li>
-</ul>
-</li>
-</ul>
-<ul>
 <li>
 <p>The toString() method of the returned value may not return &lsquo;yyyy-mm-dd&rsquo;, since this method always uses the time zone of the virtual machine.</p>
 </li>
 </ul>
+</li>
+</ol>
 </div>
-<a name="N1016E"></a><a name="Conversion+of+a+string+type+to+a+JDBC+java.sql.Date"></a>
+<a name="N1014A"></a><a name="Conversion+of+a+string+type+to+a+JDBC+java.sql.Date"></a>
 <h5>Conversion of a string type to a JDBC java.sql.Date</h5>
 <div style="margin-left: 0 ; border: 2px">
-<ul>
-<li>
 <p>Three different date formats are built into Derby.</p>
+<ol>
+<li>
+<p>(ISO/JIS) yyyy-mm-dd e.g. &ldquo;1980-03-21&rdquo;,</p>
 </li>
-</ul>
-<p>1.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (ISO/JIS) yyyy-mm-dd e.g. &ldquo;1980-03-21&rdquo;,</p>
-<p>2.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (IBM USA) mm/dd/yyyy e.g. &ldquo;03/21/1980&rdquo;, and</p>
-<p>3.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (IBM European) dd.mm.yyyy e.g. &ldquo;21.03.1980&rdquo;.</p>
-<ul>
 <li>
-<p>If the format of the string matches one of the built in formats then a conversion to a java.sql.Date matches that of a SQL DATE value with value yyyy-mm-dd.</p>
+<p>(IBM USA) mm/dd/yyyy e.g. &ldquo;03/21/1980&rdquo;, and</p>
 </li>
-</ul>
-<ul>
 <li>
-<p>If the string does not match any of the built in formats Derby attempts to use the Java locale specific parser to interpret the string as a date.</p>
+<p>(IBM European) dd.mm.yyyy e.g. &ldquo;21.03.1980&rdquo;.</p>
 </li>
-</ul>
+</ol>
+<p>If the format of the string matches one of the built in formats then a conversion to a java.sql.Date matches that of a SQL DATE value with value yyyy-mm-dd.</p>
+<p>If the string does not match any of the built in formats Derby attempts to use the Java locale specific parser to interpret the string as a date.</p>
+</div>
 </div>
-<a name="N10184"></a><a name="Derby+SQL+TIME"></a>
-<h5>Derby SQL TIME</h5>
+<a name="N1015E"></a><a name="Derby+SQL+TIME"></a>
+<h4>Derby SQL TIME</h4>
 <div style="margin-left: 0 ; border: 2px">
-<ul>
-<li>
 <p>Derby&rsquo;s SQL TIME type represents a time of day in the form hh:mm:ss with no associated time zone information.</p>
-</li>
-</ul>
-</div>
-<a name="N1018C"></a><a name="java.sql.Time"></a>
+<a name="N10164"></a><a name="java.sql.Time"></a>
 <h5>java.sql.Time</h5>
 <div style="margin-left: 0 ; border: 2px">
-<ul>
-<li>
 <p>A JDBC Time (java.sql.Time) by definition represents a point in time on an unspecified day in a given time zone.</p>
-</li>
-<li>
 <p>Java.sql.Time extends java.util.date, so it includes a date. [JDBC3] intends that the date stored in a java.sql.Time be Jan 1 1970, but this is not enforced by the class.</p>
-</li>
-<li>
 <p>JDBC drivers are required to return java.sql.Time objects that are normalized to Jan. 1 1970 according to the required time zone.</p>
-</li>
-<li>
 <p>Applications are expected to pass in java.sql.Time instances that are normalized to Jan. 1 1970.</p>
-</li>
-</ul>
 </div>
-<a name="N1019D"></a><a name="Conversion+of+a+JDBC+java.sql.Time+to+a+Derby+TIME+value"></a>
+<a name="N10170"></a><a name="Conversion+of+a+JDBC+java.sql.Time+to+a+Derby+TIME+value"></a>
 <h5>Conversion of a JDBC java.sql.Time to a Derby TIME value</h5>
 <div style="margin-left: 0 ; border: 2px">
-<p>&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; setTime() without a Calendar object or passing null for a Calendar object</p>
+<ol>
+<li>
+<p>setTime() without a Calendar object or passing null for a Calendar object</p>
 <ul>
 <li>
 <p>The hh:mm:ss values will be calculated from the milli-seconds value of the java.sql.Time instance using a Calendar object set to the time zone of the virtual machine.</p>
@@ -535,11 +557,9 @@
 <p>This hh:mm:ss value will match the output of java.sql.Date.toString().</p>
 </li>
 </ul>
-<ul>
+</li>
 <li>
 <p>setTime() with a Calendar object</p>
-</li>
-</ul>
 <ul>
 <li>
 <p>The hh:mm:ss values will be calculated from the milliseconds value of the java.sql.Date instance using the passed in Calendar.</p>
@@ -551,13 +571,15 @@
 <p>This hh:mm:dd value may not match the output of java.sql.Date.toString() for the value, since this method always uses the time zone of the virtual machine.</p>
 </li>
 </ul>
+</li>
+</ol>
 <p>Derby does not require that the application&rsquo;s java.sql.Time value be normalized to Jan 1 1970 according to the required time zone.</p>
 <p>In both cases no time zone information is stored with the SQL TIME value.</p>
 </div>
-<a name="N101C4"></a><a name="Conversion+of+a+Derby+TIME+value+to+a+JDBC+java.sql.Time"></a>
+<a name="N10198"></a><a name="Conversion+of+a+Derby+TIME+value+to+a+JDBC+java.sql.Time"></a>
 <h5>Conversion of a Derby TIME value to a JDBC java.sql.Time</h5>
 <div style="margin-left: 0 ; border: 2px">
-<ul>
+<ol>
 <li>
 <p>getTime() without a Calendar object or passing null for a Calendar object</p>
 <ul>
@@ -575,55 +597,47 @@
 <li>
 <p>A java.sql.Time instance is returned with a millisecond value corresponding to hh:mm:ss on Jan. 1 1970 according to the time zone of the Calendar</p>
 </li>
-</ul>
-</li>
-</ul>
-<ul>
 <li>
 <p>The toString() method of the returned value may not return &lsquo;hh:mm:ss&rsquo;, since this method always uses the time zone of the virtual machine.</p>
 </li>
 </ul>
+</li>
+</ol>
 </div>
-<a name="N101DE"></a><a name="Conversion+of+a+string+type+to+a+JDBC+java.sql.Time"></a>
+<a name="N101B1"></a><a name="Conversion+of+a+string+type+to+a+JDBC+java.sql.Time"></a>
 <h5>Conversion of a string type to a JDBC java.sql.Time</h5>
 <div style="margin-left: 0 ; border: 2px">
-<ul>
+<p>Three different time formats are built into Derby:</p>
+<ol>
 <li>
-<p>Three different time formats are built into Derby.</p>
+<p>(ISO/EUR) hh.mm.ss e.g. &ldquo;13.52.03&rdquo;,</p>
 </li>
-</ul>
-<p>1.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (ISO/EUR) hh.mm.ss e.g. &ldquo;13.52.03&rdquo;,</p>
-<p>2.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (IBM USA) hh:mm [AM|PM] e.g. &ldquo;1:52 PM&rdquo;, and</p>
-<p>3.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (JIS) hh:mm:ss e.g. &ldquo;13:52:03&rdquo;.</p>
-<ul>
 <li>
-<p>If the format of the string matches one of the built in formats then a conversion to a java.sql.Time matches that of a SQL TIME value with value hh:mm:ss.</p>
+<p>(IBM USA) hh:mm [AM|PM] e.g. &ldquo;1:52 PM&rdquo;, and</p>
 </li>
-</ul>
-<ul>
 <li>
-<p>If the string does not match any of the built in formats Derby attempts to use the Java locale specific parser to interpret the string as a date.</p>
+<p>(JIS) hh:mm:ss e.g. &ldquo;13:52:03&rdquo;.</p>
 </li>
-</ul>
+</ol>
+<p>If the format of the string matches one of the built in formats then a conversion to a java.sql.Time matches that of a SQL TIME value with value hh:mm:ss.</p>
+<p>If the string does not match any of the built in formats Derby attempts to use the Java locale specific parser to interpret the string as a date.</p>
+</div>
 </div>
-<a name="N101F4"></a><a name="Derby+SQL+TIMESTAMP"></a>
-<h5>Derby SQL TIMESTAMP</h5>
+<a name="N101C5"></a><a name="Derby+SQL+TIMESTAMP"></a>
+<h4>Derby SQL TIMESTAMP</h4>
 <div style="margin-left: 0 ; border: 2px">
-<ul>
-<li>
 <p>Derby&rsquo;s SQL TIMESTAMP type represents a time of day in the form yyyy-mm-dd hh:mm:ss.fffffffff (nanosecond granularity) with no associated time zone information.</p>
-</li>
-</ul>
-</div>
-<a name="N101FC"></a><a name="java.sql.Timestamp"></a>
+<a name="N101CB"></a><a name="java.sql.Timestamp"></a>
 <h5>java.sql.Timestamp</h5>
 <div style="margin-left: 0 ; border: 2px">
-<p>&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; A JDBC Timestamp (java.sql.Timestamp) by definition represents a point in time, with nanosecond resolution, in a given time zone.</p>
+<p>A JDBC Timestamp (java.sql.Timestamp) by definition represents a point in time, with nanosecond resolution, in a given time zone.</p>
 </div>
-<a name="N10202"></a><a name="Conversion+of+a+JDBC+java.sql.Timestamp+to+a+Derby+TIMESTAMP+value"></a>
+<a name="N101D1"></a><a name="Conversion+of+a+JDBC+java.sql.Timestamp+to+a+Derby+TIMESTAMP+value"></a>
 <h5>Conversion of a JDBC java.sql.Timestamp to a Derby TIMESTAMP value</h5>
 <div style="margin-left: 0 ; border: 2px">
-<p>&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; setTimestamp() without a Calendar object or passing null for a Calendar object</p>
+<ol>
+<li>
+<p>setTimestamp() without a Calendar object or passing null for a Calendar object</p>
 <ul>
 <li>
 <p>The year, month, day, hour, minute, and second values will be calculated from the milli-seconds value of the java.sql.Timestamp instance using a Calendar object set to the time zone of the virtual machine. The nanosecond value will be calculated from the nanoseconds value of the java.sql.Timestamp.</p>
@@ -632,11 +646,9 @@
 <p>The timestamp component values will match the output of java.sql.Timestamp.toString().</p>
 </li>
 </ul>
-<ul>
+</li>
 <li>
 <p>setTime() with a Calendar object</p>
-</li>
-</ul>
 <ul>
 <li>
 <p>The year, month, day, hour, minute, and second values will be calculated from the milliseconds value of the java.sql.Date instance using the passed in Calendar. The nanosecond value will be calculated from the nanoseconds value of the java.sql.Timestamp.</p>
@@ -648,11 +660,13 @@
 <p>This stored timestamp component value may not match the output of java.sql.Timestamp.toString() for the value, since this method always uses the time zone of the virtual machine.</p>
 </li>
 </ul>
+</li>
+</ol>
 </div>
-<a name="N1022D"></a><a name="Conversion+of+a+Derby+TIMESTAMP+value+to+a+JDBC+java.sql.Timestamp"></a>
+<a name="N101FD"></a><a name="Conversion+of+a+Derby+TIMESTAMP+value+to+a+JDBC+java.sql.Timestamp"></a>
 <h5>Conversion of a Derby TIMESTAMP value to a JDBC java.sql.Timestamp</h5>
 <div style="margin-left: 0 ; border: 2px">
-<ul>
+<ol>
 <li>
 <p>getTimestamp() without a Calendar object or passing null for a Calendar object</p>
 <ul>
@@ -670,40 +684,30 @@
 <li>
 <p>A java.sql.Time instance is returned with a nanosecond value corresponding to yyyy-mm-dd hh:mm:ss.fffffffff according to the time zone of the Calendar</p>
 </li>
-</ul>
-</li>
-</ul>
-<ul>
 <li>
 <p>The toString() method of the returned value may not return &lsquo;yyyy-mm-dd hh:mm:ss.fffffffff&rsquo;, since this method always uses the time zone of the virtual machine.</p>
 </li>
 </ul>
+</li>
+</ol>
 </div>
-<a name="N10247"></a><a name="Conversion+of+a+string+type+to+a+JDBC+java.sql.Timestamp"></a>
+<a name="N10216"></a><a name="Conversion+of+a+string+type+to+a+JDBC+java.sql.Timestamp"></a>
 <h5>Conversion of a string type to a JDBC java.sql.Timestamp</h5>
 <div style="margin-left: 0 ; border: 2px">
-<ul>
+<p>Two different timestamp formats are built into Derby:</p>
+<ol>
 <li>
-<p>Two different timestamp formats are built into Derby.</p>
+<p>(ISO) yyyy-mm-dd hh:mm:ss[.ffffff]e.g. &ldquo;1980-10-25 13:01:23.123456&rdquo;, and</p>
 </li>
-</ul>
-<p>1.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (ISO) yyyy-mm-dd hh:mm:ss[.ffffff]e.g. &ldquo;1980-10-25 13:01:23.123456&rdquo;, and</p>
-<p>2.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (IBM) yyyy-mm-dd-hh.mm.ss[.ffffff]e.g. &ldquo;1980-10-25-13.01.23.123456&rdquo;.</p>
-<ul>
 <li>
-<p>Note that only microsecond resolution is supported in converting strings to timestamps.</p>
+<p>(IBM) yyyy-mm-dd-hh.mm.ss[.ffffff]e.g. &ldquo;1980-10-25-13.01.23.123456&rdquo;.</p>
 </li>
-<li>
+</ol>
+<p>Note that only microsecond resolution is supported in converting strings to timestamps.</p>
 <p>If the format of the string matches one of the built in formats then a conversion to a java.sql.Timestamp matches that of a SQL TIMESTAMP value with value yyyy-mm-dd hh:mm:ss.ffffff.</p>
-</li>
-</ul>
-<ul>
-<li>
 <p>If the string does not match any of the built in formats Derby attempts to use the Java locale specific parser to interpret the string as a date.</p>
-</li>
-</ul>
 <p>
-<em>Last Updated: September 10, 2004</em>
+<em>Last Updated: Dec 9, 2004</em>
 </p>
 </div>
 </div>

Modified: incubator/derby/site/trunk/build/site/papers/derby_web.html
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/build/site/papers/derby_web.html?view=diff&rev=111464&p1=incubator/derby/site/trunk/build/site/papers/derby_web.html&r1=111463&p2=incubator/derby/site/trunk/build/site/papers/derby_web.html&r2=111464
==============================================================================
--- incubator/derby/site/trunk/build/site/papers/derby_web.html	(original)
+++ incubator/derby/site/trunk/build/site/papers/derby_web.html	Thu Dec  9 20:16:53 2004
@@ -550,8 +550,17 @@
     
 <td colspan="1" rowspan="1"> <span class="codefrag">src/documentation/resources/images</span></td>
     <td colspan="1" rowspan="1"> Images. </td>
-    <td colspan="1" rowspan="1"> Forrest copies these files without modifying them into 
-         <span class="codefrag">images</span> subdirectories to the files that reference them.
+    <td colspan="1" rowspan="1"> Forrest copies an image file without modifying it into an
+         <span class="codefrag">images</span> subdirectory relative 
+	 to the file that references it.
+	 So, if file <span class="codefrag">foo.xml</span>
+	 links <span class="codefrag">images/something.jpg</span>,
+	 put <span class="codefrag">something.jpg</span> in
+	 <span class="codefrag">src/documentation/resources/images</span>.
+	 Forrest will create an <span class="codefrag">images</span> subdirectory where
+	 <span class="codefrag">foo.html</span> is output, 
+	 if a directory doesn't exist already, and will copy 
+	 <span class="codefrag">something.jpg</span> into that directory.
     </td>
 
 </tr>
@@ -560,15 +569,15 @@
 </table>
 <p>
 The default directory structure 
-is markedly different for the src and build trees
+is quite different for the src and build trees
 (and the Derby web site uses default locations).
 Links in source files
 need to point to the name and the location of the target file in the build tree.
 </p>
 <p>
 Two files in <span class="codefrag">src/documentation/content/xdocs</span>
-don't get output to the <span class="codefrag">build</span> tree, but control the information
-and links in the resulting navigation bar:
+don't get output to the <span class="codefrag">build</span> tree; 
+they control the information and links in the resulting navigation bar:
 </p>
 <ul>
     
@@ -621,7 +630,7 @@
 
 </ul>
 </div>
-<a name="N101BA"></a><a name="4.+Build+the+site+"></a>
+<a name="N101CF"></a><a name="4.+Build+the+site+"></a>
 <h4>4. Build the site </h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -640,16 +649,18 @@
 on the machine.
 </p>
 </div>
-<a name="N101D3"></a><a name="5.+Test+the+changes+"></a>
+<a name="N101E8"></a><a name="5.+Test+the+changes+"></a>
 <h4>5. Test the changes </h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
-Test your changes by starting the Jetty webserver that is included in
+There are a couple ways (at least) to check changes.
+The first is to open <span class="codefrag">build/site/index.html</span> with your web browser.
+</p>
+<p>
+Another way is to start the Jetty webserver that is included in
 the Forrest distribution:
 </p>
-<pre class="code">
-forrest run
-</pre>
+<pre class="code">forrest run</pre>
 <p>
 After it starts, point your browser at
 <span class="codefrag">localhost:8888</span> and review the new or modified pages.
@@ -675,12 +686,11 @@
 
 </p>
 </div>
-<a name="N10202"></a><a name="6.+Commit+changes+to+the+src+and+build%2Fsite+directories"></a>
+<a name="N1021D"></a><a name="6.+Commit+changes+to+the+src+and+build%2Fsite+directories"></a>
 <h4>6. Commit changes to the src and build/site directories</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
-You need to check in the pages that were modified in both the
-<span class="codefrag">src</span> and
+Commit modified pages in the <span class="codefrag">src</span> and
 <span class="codefrag">build/site</span> trees.
 The '<span class="codefrag">forrest site</span>' command also outputs 
 <span class="codefrag">build/webapp</span> and
@@ -692,13 +702,20 @@
 and is likely to change at some point.)
 </p>
 <p>
-If you add / delete a file, you must 'svn add' or 'svn delete' it in the
+If you add or delete a file, you must 'svn add' or 'svn delete' it in the
 <span class="codefrag">src</span> and
 <span class="codefrag">build/site</span> directory hierarchies.
 Do this after 'forrest site' has been run but 
 before committing changes into Subversion.
 </p>
 <p>
+One more note about adding new text files.
+After you add the file to the repository
+set the end-of-line for the file to <span class="codefrag">native</span>:
+</p>
+<pre class="code">svn propset svn:eol-style native <em>filename</em>
+</pre>
+<p>
 When you're ready to commit,
 one way is to enter the command shown below
 from the directory that is one level above the
@@ -709,7 +726,7 @@
 svn commit --message "here is my commit message" src build/site 
 </pre>
 </div>
-<a name="N10236"></a><a name="7.+Make+web+site+changes+visible"></a>
+<a name="N1025E"></a><a name="7.+Make+web+site+changes+visible"></a>
 <h4>7. Make web site changes visible</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -721,7 +738,7 @@
 svn update
 </pre>
 </div>
-<a name="N10248"></a><a name="8.+Considering+a+quick+fix+to+the+build+tree%3F"></a>
+<a name="N10270"></a><a name="8.+Considering+a+quick+fix+to+the+build+tree%3F"></a>
 <h4>8. Considering a quick fix to the build tree?</h4>
 <div style="margin-left: 0 ; border: 2px">
 <p>
@@ -732,7 +749,7 @@
 </p>
 </div>
 <p>
-<em>Last updated November 24, 2004</em>
+<em>Last updated December 9, 2004</em>
 </p>
 </div>
 

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml?view=diff&rev=111464&p1=incubator/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml&r1=111463&p2=incubator/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml&r2=111464
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/derby_downloads.xml	Thu Dec  9 20:16:53 2004
@@ -85,14 +85,14 @@
 </p>
 
 <p>
-Check out the 10.0 branch:
+To check out the 10.0 branch:
 </p>
 
 <source>svn co http://svn.apache.org/repos/asf/incubator/derby/code/branches/10.0/
 </source>
 
 <p>
-Check out the development trunk:
+To check out the development trunk:
 </p>
 <source>svn checkout http://svn.apache.org/repos/asf/incubator/derby/code/trunk/</source>
 
@@ -268,7 +268,7 @@
 </section>
 
 <p>
-<em>Last updated: Dec 6, 2004</em>
+<em>Last updated: Dec 9, 2004</em>
 </p>
 
 </body>

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml?view=diff&rev=111464&p1=incubator/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml&r1=111463&p2=incubator/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml&r2=111464
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/logo_contest.xml	Thu Dec  9 20:16:53 2004
@@ -68,11 +68,40 @@
      (although then lines should be horizontally)..because Derby indeed functions like a melody.<br/></td>
   <td><a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&amp;msgNo=277">1</a></td>
 </tr>
+
+<tr>
+<td><img src="images/logo_entry_2.gif" alt="entry_2" width="233" height="146"></img></td>
+<td>Ken Coar</td>
+<td></td>
+<td><a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&amp;msgNo=295">2</a></td>
+</tr>
+
+<tr>
+<td><img src="images/logo_entry_3.gif" alt="entry_3" width="247" height="175"></img></td>
+<td>Ken Coar</td>
+<td></td>
+<td><a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&amp;msgNo=300">3</a></td>
+</tr>
+
+<tr>
+<td><img src="images/logo_entry_4.JPG" alt="entry_4" width="327" height="92"></img></td>
+<td>Army</td>
+<td></td>
+<td><a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&amp;msgNo=299">4</a></td>
+</tr>
+
+<tr>
+<td><img src="images/logo_entry_5.jpg" alt="entry_5" width="231" height="154"></img></td>
+<td>Adam Blinkinsop</td>
+<td></td>
+<td><a href="http://nagoya.apache.org/eyebrowse/ReadMsg?listName=derby-user@db.apache.org&amp;msgNo=289">5</a></td>
+</tr>
+
 </table>
 </section>
 
 <p>
-<em>Last updated: Dec 8, 2004</em>
+<em>Last updated: Dec 9, 2004</em>
 </p>
 </body>
 </document>

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/papers/JDBCImplementation.ihtml
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/xdocs/papers/JDBCImplementation.ihtml?view=diff&rev=111464&p1=incubator/derby/site/trunk/src/documentation/content/xdocs/papers/JDBCImplementation.ihtml&r1=111463&p2=incubator/derby/site/trunk/src/documentation/content/xdocs/papers/JDBCImplementation.ihtml&r2=111464
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/papers/JDBCImplementation.ihtml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/papers/JDBCImplementation.ihtml	Thu Dec  9 20:16:53 2004
@@ -1,12 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <HTML>
 <HEAD>
-	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252">
+	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=iso-8859-1">
 	<TITLE>Derby JDBC Implementation Notes</TITLE>
-	<META NAME="GENERATOR" CONTENT="OpenOffice.org 1.1.2  (Win32)">
+	<META NAME="GENERATOR" CONTENT="OpenOffice.org 1.1.1  (Linux)">
 	<META NAME="CREATED" CONTENT="20040812;9464460">
-	<META NAME="CHANGEDBY" CONTENT="D D">
-	<META NAME="CHANGED" CONTENT="20040812;10044140">
+	<META NAME="CHANGED" CONTENT="20041129;17412500">
 	<META NAME="ProgId" CONTENT="Word.Document">
 	<META NAME="Originator" CONTENT="Microsoft Word 9">
 	<STYLE>
@@ -20,128 +19,83 @@
 	</STYLE>
 </HEAD>
 <BODY LANG="en-US" TEXT="#000000" DIR="LTR">
-<FORM ACTION="http://www.amazon.com/exec/obidos/flex-sign-in/ref=cm_r8n_jsn/002-8898330-3588828" METHOD="POST">
-	<INPUT TYPE=HIDDEN NAME="method" VALUE="GET">
-	<INPUT TYPE=HIDDEN NAME="opt" VALUE="n">
-	<INPUT TYPE=HIDDEN NAME="cont-page" VALUE="cm/justsayno-signed-in-continue">
-	<INPUT TYPE=HIDDEN NAME="cont-type" VALUE="cust-rec">
-	<INPUT TYPE=HIDDEN NAME="response" VALUE="rate-item">
-	<INPUT TYPE=HIDDEN NAME="page" VALUE="community/justsayno-sign-in-secure.html">
-	<INPUT TYPE=HIDDEN NAME="secure-rate-item-next-page" VALUE="tg/stores/detail/-/books/0321173848/glance">
-	<INPUT TYPE=HIDDEN NAME="rate-item-next-page" VALUE="tg/stores/detail/-/books/0321173848/glance">
-	<INPUT TYPE=HIDDEN NAME="rated-item-value" VALUE="-">
-	<INPUT TYPE=HIDDEN NAME="rating-type" VALUE="favorite-lists">
-	<INPUT TYPE=HIDDEN NAME="creator-customer-id">
-	<INPUT TYPE=HIDDEN NAME="require-valid-asin" VALUE="true">
-	<INPUT TYPE=HIDDEN NAME="rated-item-id">
-	<INPUT TYPE=HIDDEN NAME="form-purpose" VALUE="just-say-no">
-	<INPUT TYPE=HIDDEN NAME="form-section">
-</FORM>
-<FORM ACTION="http://www.amazon.com/exec/obidos/flex-sign-in/ref=cm_r8n_jsn/002-8898330-3588828" METHOD="POST">
-	<INPUT TYPE=HIDDEN NAME="method" VALUE="GET">
-	<INPUT TYPE=HIDDEN NAME="opt" VALUE="n">
-	<INPUT TYPE=HIDDEN NAME="cont-page" VALUE="cm/justsayno-signed-in-continue">
-	<INPUT TYPE=HIDDEN NAME="cont-type" VALUE="cust-rec">
-	<INPUT TYPE=HIDDEN NAME="response" VALUE="rate-item">
-	<INPUT TYPE=HIDDEN NAME="page" VALUE="community/justsayno-sign-in-secure.html">
-	<INPUT TYPE=HIDDEN NAME="secure-rate-item-next-page" VALUE="tg/stores/detail/-/books/0321173848/glance">
-	<INPUT TYPE=HIDDEN NAME="rate-item-next-page" VALUE="tg/stores/detail/-/books/0321173848/glance">
-	<INPUT TYPE=HIDDEN NAME="rated-item-value" VALUE="-">
-	<INPUT TYPE=HIDDEN NAME="rating-type" VALUE="favorite-lists">
-	<INPUT TYPE=HIDDEN NAME="creator-customer-id">
-	<INPUT TYPE=HIDDEN NAME="require-valid-asin" VALUE="true">
-	<INPUT TYPE=HIDDEN NAME="rated-item-id">
-	<INPUT TYPE=HIDDEN NAME="form-purpose" VALUE="just-say-no">
-	<INPUT TYPE=HIDDEN NAME="form-section">
-</FORM>
-<H1>Derby JDBC Implementation Notes</H1>
-<H2>&nbsp;Overview</H2>
-<P CLASS="msonormal">The JDBC specification is sometimes unclear or
-contradictory. This document covers how Derby implements some JDBC
-features where the specification might be unclear.</P>
-<P CLASS="msonormal">The JDBC 3.0 specicification is in theory a
-single document however clarifications or addiitonal information can
-also be found in the Javadoc for java.sql and javax.sql, and in the
-offical JDBC tutorial book.</P>
-<P CLASS="msonormal">[JDBC3] &ndash; Downloadable from
+<H1>Overview</H1>
+<P>The JDBC specification is sometimes unclear or contradictory. This
+document covers how Derby implements some JDBC features where the
+specification might be unclear.</P>
+<P>The JDBC 3.0 specicification is in theory a single document
+however clarifications or addiitonal information can also be found in
+the Javadoc for java.sql and javax.sql, and in the offical JDBC
+tutorial book.</P>
+<P>[JDBC3] &ndash; Downloadable from
 <A HREF="http://java.sun.com/products/jdbc/index.jsp">http://java.sun.com/products/jdbc/index.jsp</A></P>
-<P CLASS="msonormal">[JAVADOC14] &ndash; downloadable from
+<P>[JAVADOC14] &ndash; downloadable from
 <A HREF="http://java.sun.com/products/jdbc/index.jsp">http://java.sun.com/products/jdbc/index.jsp</A></P>
-<P CLASS="msonormal">[TUTORIAL3] &ndash; JDBC API Tutorial and
-Reference, Third Edition. ISBN 0321173848   
+<P>[TUTORIAL3] &ndash; JDBC API Tutorial and Reference, Third
+Edition. ISBN 0321173848
 <A HREF="http://java.sun.com/developer/Books/jdbc/Fisher/index.html">http://java.sun.com/developer/Books/jdbc/Fisher/index.html</A>
 </P>
-<H2>Java.sql.ResultSet</H2>
-<P CLASS="msonormal">Support for data conversion using the getXXX()
-methods matches Table B-6 in the [JDBC3], with some extensions
-described below.</P>
-<P CLASS="msonormal"><B>Extension - </B>If the value column is null,
-then generally any getXXX method can be used to fetch the null value
-and a null or a representation of zero will be returned and a
-subsequent call to wasNull() will return true. It is not recommended
-that applications take advantage of this liberal conversion of SQL
-NULL values, use of a getXXX() method that works against NULL and
-non-NULL values is strongly recommended.</P>
-<H3>getAsciiStream()</H3>
-<P CLASS="msonormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<B>Behavior Clarification</B></P>
-<P CLASS="msonormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-An ASCII character is defined as an eight bit character (range 0x00
-to 0xff), see CHAR() function definition by [JDBC3]  in appendix C.2.</P>
-<P CLASS="msonormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-For character types&nbsp; (Types.CHAR, Types.VARCHAR &amp;
+<H1>Java.sql.ResultSet</H1>
+<P>Support for data conversion using the getXXX() methods matches
+Table B-6 in the [JDBC3], with some extensions described below.</P>
+<P><SPAN STYLE="font-weight: medium">Extension</SPAN></P>
+<P>If the value column is null, then generally any getXXX method can
+be used to fetch the null value and a null or a representation of
+zero will be returned and a subsequent call to wasNull() will return
+true. It is not recommended that applications take advantage of this
+liberal conversion of SQL NULL values, use of a getXXX() method that
+works against NULL and non-NULL values is strongly recommended.</P>
+<H2>GetAsciiStream()</H2>
+<P>Behavior Clarification</P>
+<P>An ASCII character is defined as an eight bit character (range
+0x00 to 0xff), see CHAR() function definition by [JDBC3] in appendix
+C.2.</P>
+<P>For character types (Types.CHAR, Types.VARCHAR &amp;
 Types.LONGVARCHAR) &ndash; Each character in the value is translated
 to one byte in the ASCII stream, For Unicode characters in the range
 0x0000 to 0x00ff, they are translated to a byte with the matching
 value (0x00 to 0xff). Characters outside this range, (0x0100 to
 0xffff) are translated to 0x3f (&lsquo;?&rsquo;).</P>
-<P CLASS="msonormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-For binary types (Types.BINARY, Types.VARBINARY, and
+<P>For binary types (Types.BINARY, Types.VARBINARY, and
 Types.LONGVARBINARY) getAsciiStream() returns a stream with identical
 contents to that returned by getBinaryStream() on the same column.</P>
-<P CLASS="msonormal">&nbsp;</P>
-<P CLASS="msonormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<B>Extensions</B></P>
-<P CLASS="msonormal" STYLE="margin-left: 1.25in"><FONT FACE="Symbol">&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</FONT>On Types.CLOB columns returns a stream with identical contents
-to that returned by getClob().getAsciiStream() on the same column if
-the CLOB value is not NULL. If the CLOB value is NULL then null is
-returned.</P>
-<P CLASS="msonormal" STYLE="margin-left: 1.25in"><FONT FACE="Symbol">&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</FONT>On Types.BLOB columns returns a stream with identical contents
-to that returned by getBlob().getBinaryStream() on the same column if
-the BLOB value is not NULL. If the BLOB value is NULL then null is
-returned.</P>
-<P CLASS="msonormal" STYLE="margin-left: 1in">&nbsp;</P>
-<H3>getBinaryStream()</H3>
-<P CLASS="msonormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<B>Extensions</B></P>
-<P CLASS="msonormal" STYLE="margin-left: 1.25in"><FONT FACE="Symbol">&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</FONT>On Types.BLOB columns returns a stream with identical contents
-to that returned by getBlob().getBinaryStream() on the same column if
+<P>Extensions</P>
+<UL>
+	<LI><P>On Types.CLOB columns returns a stream with identical
+	contents to that returned by getClob().getAsciiStream() on the same
+	column if the CLOB value is not NULL. If the CLOB value is NULL then
+	null is returned.</P>
+</UL>
+<UL>
+	<LI><P>On Types.BLOB columns returns a stream with identical
+	contents to that returned by getBlob().getBinaryStream() on the same
+	column if the BLOB value is not NULL. If the BLOB value is NULL then
+	null is returned.</P>
+</UL>
+<H2>GetBinaryStream()</H2>
+<P>Extensions</P>
+<P>On Types.BLOB columns returns a stream with identical contents to
+that returned by getBlob().getBinaryStream() on the same column if
 the BLOB value is not NULL. If the BLOB value is NULL then null is
 returned.</P>
-<P CLASS="msonormal" STYLE="margin-left: 1in">&nbsp;</P>
-<H3>getCharacterStream()</H3>
-<P CLASS="msonormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<B>Behavior Clarification</B></P>
-<P CLASS="msonormal">For binary types (Types.BINARY, Types.VARBINARY,
-and Types.LONGVARBINARY, Types.BLOB) getString() the value is
-converted to a stream of characters as though it is encoded using
-UTF-16BE.</P>
-<P CLASS="msonormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<B>Extensions</B></P>
-<P CLASS="msonormal" STYLE="margin-left: 1.25in"><FONT FACE="Symbol">&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</FONT>On Types.CLOB columns returns a reader with identical contents
-to that returned by getClob().getCharacterStream() on the same column
-if the CLOB value is not NULL. If the CLOB value is NULL then null is
-returned.</P>
-<P CLASS="msonormal" STYLE="margin-left: 1.25in"><FONT FACE="Symbol">&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</FONT>On Types.BLOB columns supported with conversion as a binary
-type.</P>
-<H3>getString()</H3>
-<P CLASS="msonormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<B>Behavior Clarification</B></P>
+<H2>GetCharacterStream()</H2>
+<P>Behavior Clarification</P>
+<P>For binary types (Types.BINARY, Types.VARBINARY, and
+Types.LONGVARBINARY, Types.BLOB) getString() the value is converted
+to a stream of characters as though it is encoded using UTF-16BE.</P>
+<P>Extensions</P>
+<UL>
+	<LI><P>On Types.CLOB columns returns a reader with identical
+	contents to that returned by getClob().getCharacterStream() on the
+	same column if the CLOB value is not NULL. If the CLOB value is NULL
+	then null is returned.</P>
+</UL>
+<UL>
+	<LI><P>On Types.BLOB columns supported with conversion as a binary
+	type.</P>
+</UL>
+<H2>GetString()</H2>
+<P>Behavior Clarification</P>
 <P>For binary types (Types.BINARY, Types.VARBINARY, and
 Types.LONGVARBINARY, Types.BLOB) getString() returns String
 containing a two character hexadecimal representation for every byte
@@ -151,96 +105,91 @@
 match the contents of the stream returned by getAsciiStream or
 getCharacterStream on the same column. 
 </P>
-<P CLASS="msonormal">&nbsp;</P>
-<P CLASS="msonormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<B>Extensions</B></P>
-<P CLASS="msonormal" STYLE="margin-left: 1.25in"><FONT FACE="Symbol">&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</FONT>On Types.CLOB columns returns a String representing the
-contents of the CLOB value is not NULL. If the CLOB value is NULL
-then null is returned.</P>
-<P CLASS="msonormal" STYLE="margin-left: 1.25in"><FONT FACE="Symbol">&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</FONT>On Types.BLOB columns supported with conversion as a binary
-type.</P>
-<H3>getUnicodeStream()</H3>
-<P CLASS="msonormal">Not implemented, deprecated by [JDBC3].</P>
-<H3>Examples</H3>
-<H1>Binary Column</H1>
-<P CLASS="msonormal">If a binary column has been set with the Java
-byte array containing fours bytes, byte[] data = {0x34, 0x87, 0xc2,
-0x1f} then:</P>
-<P CLASS="msonormal" STYLE="margin-left: 1.75in"><FONT FACE="Symbol">&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</FONT>getBinaryStream() returns a java.io.InputStream containing
-four bytes - 0x34, 0x87, 0xc2, 0x1f</P>
-<P CLASS="msonormal" STYLE="margin-left: 1.75in"><FONT FACE="Symbol">&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</FONT>getAsciiStream() returns a java.io.InputStream containing four
-bytes -&nbsp; 0x34, 0x87, 0xc2, 0x1f&nbsp; [ same as
-getBinaryStream() ]</P>
-<P CLASS="msonormal" STYLE="margin-left: 1.75in"><FONT FACE="Symbol">&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</FONT>getCharacterStream() returns a java.io.Reader containing two
-characters - 0x3487, 0xc21f</P>
-<P CLASS="msonormal" STYLE="margin-left: 1.75in"><FONT FACE="Symbol">&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</FONT>getString() returns a String with eight characters &ldquo;3487c21f&rdquo;
-</P>
-<H2>java.sql.Blob</H2>
-<H3>getBytes(int pos, int length)</H3>
-<P CLASS="msonormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<B>Behavior Clarification</B></P>
-<P CLASS="msonormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-If the pos (position) argument is greater than the length of the BLOB
-then an exception is thrown. This matches the semantics of the SQL
-SUBSTR function.</P>
-<H3>position(byte pattern, int start)<BR>position(Blob pattern, int
-start)</H3>
-<P CLASS="msonormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<B>Behavior Clarification</B></P>
-<P CLASS="msonormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-If the pattern argument has length zero, then the value of start
+<P>Extensions</P>
+<UL>
+	<LI><P>On Types.CLOB columns returns a String representing the
+	contents of the CLOB value is not NULL. If the CLOB value is NULL
+	then null is returned.</P>
+</UL>
+<UL>
+	<LI><P>On Types.BLOB columns supported with conversion as a binary
+	type.</P>
+</UL>
+<H2>GetUnicodeStream()</H2>
+<P>Not implemented, deprecated by [JDBC3].</P>
+<H2>Examples</H2>
+<P>Binary Column</P>
+<P>If a binary column has been set with the Java byte array
+containing fours bytes, byte[] data = {0x34, 0x87, 0xc2, 0x1f} then:</P>
+<UL>
+	<UL>
+		<LI><P>getBinaryStream() returns a java.io.InputStream containing
+		four bytes - 0x34, 0x87, 0xc2, 0x1f</P>
+	</UL>
+</UL>
+<UL>
+	<UL>
+		<LI><P>getAsciiStream() returns a java.io.InputStream containing
+		four bytes -&nbsp; 0x34, 0x87, 0xc2, 0x1f&nbsp; [ same as
+		getBinaryStream() ]</P>
+	</UL>
+</UL>
+<UL>
+	<UL>
+		<LI><P>getCharacterStream() returns a java.io.Reader containing two
+		characters - 0x3487, 0xc21f</P>
+		<LI><P>getString() returns a String with eight characters
+		&ldquo;3487c21f&rdquo; 
+		</P>
+	</UL>
+</UL>
+<H1>java.sql.Blob</H1>
+<H2>getBytes(int pos, int length)</H2>
+<P>Behavior Clarification</P>
+<P>If the pos (position) argument is greater than the length of the
+BLOB then an exception is thrown. This matches the semantics of the
+SQL SUBSTR function.</P>
+<H2>position(byte pattern, int start) <SPAN STYLE="font-style: normal">and</SPAN>
+position(Blob pattern, int start)</H2>
+<P>Behavior Clarification</P>
+<P>If the pattern argument has length zero, then the value of start
 argument will be returned. This matches the semantics of the SQL
 LOCATE function.</P>
-<H2>java.sql.Clob</H2>
-<H3>getSubString(int pos, int length)</H3>
-<P CLASS="msonormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<B>Behavior Clarification</B></P>
-<P CLASS="msonormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-If the pos (position) argument is greater than the length of the CLOB
-then an exception is thrown. This matches the semantics of the SQL
-SUBSTR function.</P>
-<H3>position(String searchstr, int start)<BR>position(Clob searchstr,
-int start)</H3>
-<P CLASS="msonormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<B>Behavior Clarification</B></P>
-<P CLASS="msonormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-If the searchstr argument has length zero (the empty string), then
+<H1>java.sql.Clob</H1>
+<H2>getSubString(int pos, int length)</H2>
+<P>Behavior Clarification</P>
+<P>If the pos (position) argument is greater than the length of the
+CLOB then an exception is thrown. This matches the semantics of the
+SQL SUBSTR function.</P>
+<H2>position(String searchstr, int start) and<BR>position(Clob
+searchstr, int start)</H2>
+<P>Behavior Clarification</P>
+<P>If the searchstr argument has length zero (the empty string), then
 the value of start argument will be returned. This matches the
 semantics of the SQL LOCATE function.</P>
-<H2>Date Handling</H2>
-<H3>Derby SQL DATE</H3>
-<UL TYPE=DISC>
-	<LI><P>Derby&rsquo;s SQL DATE type represents a date in the form
-	yyyy-mm-dd with no associated time zone information. 
-	</P>
-</UL>
+<H1>Date Handling</H1>
+<H2>Derby SQL DATE</H2>
+<P>Derby&rsquo;s SQL DATE type represents a date in the form
+yyyy-mm-dd with no associated time zone information. 
+</P>
 <H3>java.sql.Date</H3>
-<UL TYPE=DISC>
-	<LI><P>A JDBC Date (java.sql.Date) by definition represents a point
-	in time on a given date in a given time zone. 
-	</P>
-	<LI><P>[JDBC3] intends that the point in time for a java.sql.Date
-	object is 00:00 (midnight), but this is not enforced by the class. 
-	</P>
-	<LI><P>JDBC drivers are required to return java.sql.Date objects
-	that are normalized to 00:00 according to the required time zone. 
-	</P>
-	<LI><P>Applications are expected to pass in java.sql.Date instances
-	that are normalized to 00:00 (see section 18.1.1 of [TUTORIAL3]). 
-	</P>
-</UL>
+<P>A JDBC Date (java.sql.Date) by definition represents a point in
+time on a given date in a given time zone. 
+</P>
+<P>[JDBC3] intends that the point in time for a java.sql.Date object
+is 00:00 (midnight), but this is not enforced by the class. 
+</P>
+<P>JDBC drivers are required to return java.sql.Date objects that are
+normalized to 00:00 according to the required time zone. 
+</P>
+<P>Applications are expected to pass in java.sql.Date instances that
+are normalized to 00:00 (see section 18.1.1 of [TUTORIAL3]). 
+</P>
 <H3>Conversion of a JDBC java.sql.Date to a Derby DATE value</H3>
 <OL>
 	<LI><P>setDate() without a Calendar object or passing null for a
-	Calendar object 
-	</P>
-	<UL TYPE=CIRCLE>
+	Calendar object:</P>
+	<UL>
 		<LI><P>The yyyy-mm-dd values will be calculated from the
 		milli-seconds value of the java.sql.Date instance using a Calendar
 		object set to the time zone of the virtual machine. 
@@ -249,9 +198,8 @@
 		java.sql.Date.toString(). 
 		</P>
 	</UL>
-	<LI><P>setDate() with a Calendar object 
-	</P>
-	<UL TYPE=CIRCLE>
+	<LI><P>setDate() with a Calendar object:</P>
+	<UL>
 		<LI><P>The yyyy-mm-dd values will be calculated from the
 		milliseconds value of the java.sql.Date instance using the passed
 		in Calendar. 
@@ -267,17 +215,15 @@
 		</P>
 	</UL>
 </OL>
-<P CLASS="msonormal">Derby does not require that the application&rsquo;s
-java.sql.Date value is normalized to 00:00 according to the required
-time zone.</P>
-<P CLASS="msonormal">In both cases no time zone information is stored
-with the SQL DATE value.</P>
+<P>Derby does not require that the application&rsquo;s java.sql.Date
+value is normalized to 00:00 according to the required time zone.</P>
+<P>In both cases no time zone information is stored with the SQL DATE
+value.</P>
 <H3>Conversion of a Derby DATE value to a JDBC java.sql.Date</H3>
-<UL TYPE=DISC>
+<OL>
 	<LI><P>getDate() without a Calendar object or passing null for a
-	Calendar object 
-	</P>
-	<UL TYPE=CIRCLE>
+	Calendar object:</P>
+	<UL>
 		<LI><P>A java.sql.Date instance is returned with a millisecond
 		value corresponding to 00:00 on yyyy-mm-dd according to the time
 		zone of the java virtual machine 
@@ -286,75 +232,60 @@
 		&lsquo;yyyy-mm-dd&rsquo; 
 		</P>
 	</UL>
-	<LI><P>getDate() with a Calendar object 
-	</P>
-	<UL TYPE=CIRCLE>
+	<LI><P>getDate() with a Calendar object:</P>
+	<UL>
 		<LI><P>A java.sql.Date instance is returned with a millisecond
 		value corresponding to 00:00 on yyyy-mm-dd according to the time
 		zone of the Calendar 
 		</P>
-	</UL>
-</UL>
-<OL START=2>
-	<UL TYPE=CIRCLE>
 		<LI><P>The toString() method of the returned value may not return
 		&lsquo;yyyy-mm-dd&rsquo;, since this method always uses the time
 		zone of the virtual machine. 
 		</P>
 	</UL>
 </OL>
-<H3>Conversion of a string type to a JDBC java.sql.Date</H3>
-<UL TYPE=DISC>
-	<LI><P>Three different date formats are built into Derby.</P>
-</UL>
-<P CLASS="msonormal">1.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (ISO/JIS)
-yyyy-mm-dd e.g. &ldquo;1980-03-21&rdquo;,</P>
-<P CLASS="msonormal">2.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (IBM USA)
-mm/dd/yyyy e.g. &ldquo;03/21/1980&rdquo;, and</P>
-<P CLASS="msonormal">3.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (IBM European)
-dd.mm.yyyy e.g. &ldquo;21.03.1980&rdquo;.</P>
-<UL TYPE=DISC>
-	<LI><P>If the format of the string matches one of the built in
-	formats then a conversion to a java.sql.Date matches that of a SQL
-	DATE value with value yyyy-mm-dd. 
-	</P>
-</UL>
-<UL TYPE=DISC>
-	<LI><P>If the string does not match any of the built in formats
-	Derby attempts to use the Java locale specific parser to interpret
-	the string as a date. 
-	</P>
-</UL>
-<H3>Derby SQL TIME</H3>
-<UL TYPE=DISC>
-	<LI><P>Derby&rsquo;s SQL TIME type represents a time of day in the
-	form hh:mm:ss with no associated time zone information. 
-	</P>
-</UL>
+<H3>Conversion of a string type to a JDBC java.sql.Date 
+</H3>
+<P>Three different date formats are built into Derby.</P>
+<OL>
+	<OL>
+		<LI><P>(ISO/JIS) yyyy-mm-dd e.g. &ldquo;1980-03-21&rdquo;,</P>
+		<LI><P>(IBM USA) mm/dd/yyyy e.g. &ldquo;03/21/1980&rdquo;, and</P>
+		<LI><P>(IBM European) dd.mm.yyyy e.g. &ldquo;21.03.1980&rdquo;.</P>
+	</OL>
+</OL>
+<P>If the format of the string matches one of the built in formats
+then a conversion to a java.sql.Date matches that of a SQL DATE value
+with value yyyy-mm-dd. 
+</P>
+<P>If the string does not match any of the built in formats Derby
+attempts to use the Java locale specific parser to interpret the
+string as a date. 
+</P>
+<H2>Derby SQL TIME</H2>
+<P>Derby&rsquo;s SQL TIME type represents a time of day in the form
+hh:mm:ss with no associated time zone information. 
+</P>
 <H3>java.sql.Time</H3>
-<UL TYPE=DISC>
-	<LI><P>A JDBC Time (java.sql.Time) by definition represents a point
-	in time on an unspecified day in a given time zone. 
-	</P>
-	<LI><P>Java.sql.Time extends java.util.date, so it includes a date.
-	[JDBC3] intends that the date stored in a java.sql.Time be Jan 1
-	1970, but this is not enforced by the class. 
-	</P>
-	<LI><P>JDBC drivers are required to return java.sql.Time objects
-	that are normalized to Jan. 1 1970 according to the required time
-	zone. 
-	</P>
-	<LI><P>Applications are expected to pass in java.sql.Time instances
-	that are normalized to Jan. 1 1970. 
-	</P>
-</UL>
-<H3>Conversion of a JDBC java.sql.Time to a Derby TIME value</H3>
-<P CLASS="msonormal"><FONT FACE="Symbol">&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</FONT>setTime() without a Calendar object or passing null for a
-Calendar object 
+<P>A JDBC Time (java.sql.Time) by definition represents a point in
+time on an unspecified day in a given time zone. 
 </P>
-<OL START=2>
-	<UL TYPE=CIRCLE>
+<P>Java.sql.Time extends java.util.date, so it includes a date.
+[JDBC3] intends that the date stored in a java.sql.Time be Jan 1
+1970, but this is not enforced by the class. 
+</P>
+<P>JDBC drivers are required to return java.sql.Time objects that are
+normalized to Jan. 1 1970 according to the required time zone. 
+</P>
+<P>Applications are expected to pass in java.sql.Time instances that
+are normalized to Jan. 1 1970. 
+</P>
+<H3>Conversion of a JDBC java.sql.Time to a Derby TIME value</H3>
+<OL>
+	<LI><P>setTime() without a Calendar object or passing null for a
+	Calendar object 
+	</P>
+	<UL>
 		<LI><P>The hh:mm:ss values will be calculated from the
 		milli-seconds value of the java.sql.Time instance using a Calendar
 		object set to the time zone of the virtual machine. 
@@ -363,13 +294,9 @@
 		java.sql.Date.toString(). 
 		</P>
 	</UL>
-</OL>
-<UL TYPE=DISC>
 	<LI><P>setTime() with a Calendar object 
 	</P>
-</UL>
-<OL START=2>
-	<UL TYPE=CIRCLE>
+	<UL>
 		<LI><P>The hh:mm:ss values will be calculated from the milliseconds
 		value of the java.sql.Date instance using the passed in Calendar. 
 		</P>
@@ -384,17 +311,17 @@
 		</P>
 	</UL>
 </OL>
-<P CLASS="msonormal">Derby does not require that the application&rsquo;s
-java.sql.Time value be normalized to Jan 1 1970 according to the
-required time zone.</P>
-<P CLASS="msonormal">In both cases no time zone information is stored
-with the SQL TIME value.</P>
+<P>Derby does not require that the application&rsquo;s java.sql.Time
+value be normalized to Jan 1 1970 according to the required time
+zone.</P>
+<P>In both cases no time zone information is stored with the SQL TIME
+value.</P>
 <H3>Conversion of a Derby TIME value to a JDBC java.sql.Time</H3>
-<UL TYPE=DISC>
+<OL>
 	<LI><P>getTime() without a Calendar object or passing null for a
 	Calendar object 
 	</P>
-	<UL TYPE=CIRCLE>
+	<UL>
 		<LI><P>A java.sql.Time instance is returned with a millisecond
 		value corresponding to hh:mm:ss on Jan. 1 1970 according to the
 		time zone of the java virtual machine 
@@ -405,63 +332,49 @@
 	</UL>
 	<LI><P>getTime() with a Calendar object 
 	</P>
-	<UL TYPE=CIRCLE>
+	<UL>
 		<LI><P>A java.sql.Time instance is returned with a millisecond
 		value corresponding to hh:mm:ss on Jan. 1 1970 according to the
 		time zone of the Calendar 
 		</P>
-	</UL>
-</UL>
-<OL START=2>
-	<UL TYPE=CIRCLE>
 		<LI><P>The toString() method of the returned value may not return
 		&lsquo;hh:mm:ss&rsquo;, since this method always uses the time zone
 		of the virtual machine. 
 		</P>
 	</UL>
 </OL>
-<H3>Conversion of a string type to a JDBC java.sql.Time 
-</H3>
-<UL TYPE=DISC>
-	<LI><P>Three different time formats are built into Derby.</P>
-</UL>
-<P CLASS="msonormal" STYLE="margin-left: 1in">1.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-(ISO/EUR) hh.mm.ss e.g. &ldquo;13.52.03&rdquo;,</P>
-<P CLASS="msonormal" STYLE="margin-left: 1in">2.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-(IBM USA) hh:mm [AM|PM] e.g. &ldquo;1:52 PM&rdquo;, and</P>
-<P CLASS="msonormal" STYLE="margin-left: 1in">3.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-(JIS) hh:mm:ss e.g. &ldquo;13:52:03&rdquo;.</P>
-<UL TYPE=DISC>
-	<LI><P>If the format of the string matches one of the built in
-	formats then a conversion to a java.sql.Time matches that of a SQL
-	TIME value with value hh:mm:ss. 
-	</P>
-</UL>
-<UL TYPE=DISC>
-	<LI><P>If the string does not match any of the built in formats
-	Derby attempts to use the Java locale specific parser to interpret
-	the string as a date. 
-	</P>
-</UL>
-<H3>Derby SQL TIMESTAMP</H3>
-<UL TYPE=DISC>
-	<LI><P>Derby&rsquo;s SQL TIMESTAMP type represents a time of day in
-	the form yyyy-mm-dd hh:mm:ss.fffffffff (nanosecond granularity) with
-	no associated time zone information. 
-	</P>
-</UL>
+<H3>Conversion of a string type to a JDBC java.sql.Time</H3>
+<P>Three different time formats are built into Derby:</P>
+<OL>
+	<OL>
+		<LI><P>(ISO/EUR) hh.mm.ss e.g. &ldquo;13.52.03&rdquo;,</P>
+		<LI><P>(IBM USA) hh:mm [AM|PM] e.g. &ldquo;1:52 PM&rdquo;, and</P>
+		<LI><P>(JIS) hh:mm:ss e.g. &ldquo;13:52:03&rdquo;.</P>
+	</OL>
+</OL>
+<P>If the format of the string matches one of the built in formats
+then a conversion to a java.sql.Time matches that of a SQL TIME value
+with value hh:mm:ss. 
+</P>
+<P>If the string does not match any of the built in formats Derby
+attempts to use the Java locale specific parser to interpret the
+string as a date. 
+</P>
+<H2>Derby SQL TIMESTAMP</H2>
+<P>Derby&rsquo;s SQL TIMESTAMP type represents a time of day in the
+form yyyy-mm-dd hh:mm:ss.fffffffff (nanosecond granularity) with no
+associated time zone information. 
+</P>
 <H3>java.sql.Timestamp</H3>
-<P CLASS="msonormal"><FONT FACE="Symbol">&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</FONT>A JDBC Timestamp (java.sql.Timestamp) by definition represents
-a point in time, with nanosecond resolution, in a given time zone.</P>
+<P>A JDBC Timestamp (java.sql.Timestamp) by definition represents a
+point in time, with nanosecond resolution, in a given time zone.</P>
 <H3>Conversion of a JDBC java.sql.Timestamp to a Derby TIMESTAMP
 value</H3>
-<P CLASS="msonormal"><FONT FACE="Symbol">&middot;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-</FONT>setTimestamp() without a Calendar object or passing null for a
-Calendar object 
-</P>
-<OL START=2>
-	<UL TYPE=CIRCLE>
+<OL>
+	<LI><P>setTimestamp() without a Calendar object or passing null for
+	a Calendar object 
+	</P>
+	<UL>
 		<LI><P>The year, month, day, hour, minute, and second values will
 		be calculated from the milli-seconds value of the
 		java.sql.Timestamp instance using a Calendar object set to the time
@@ -472,18 +385,13 @@
 		java.sql.Timestamp.toString(). 
 		</P>
 	</UL>
-</OL>
-<UL TYPE=DISC>
 	<LI><P>setTime() with a Calendar object 
 	</P>
-</UL>
-<OL START=2>
-	<UL TYPE=CIRCLE>
+	<UL>
 		<LI><P>The year, month, day, hour, minute, and second values will
 		be calculated from the milliseconds value of the java.sql.Date
 		instance using the passed in Calendar. The nanosecond value will be
-		calculated from the nanoseconds value of the java.sql.Timestamp. 
-		</P>
+		calculated from the nanoseconds value of the java.sql.Timestamp.</P>
 		<LI><P>The code for this
 		is<BR><FONT FACE="Courier">cal.setTimeInMillis(value.getTime());<BR>year
 		= cal.get(Calendar.YEAR);<BR>month = cal.get(Calendar.MONTH) +
@@ -500,61 +408,52 @@
 </OL>
 <H3>Conversion of a Derby TIMESTAMP value to a JDBC
 java.sql.Timestamp</H3>
-<UL TYPE=DISC>
+<OL>
 	<LI><P>getTimestamp() without a Calendar object or passing null for
 	a Calendar object 
 	</P>
-	<UL TYPE=CIRCLE>
+	<UL>
 		<LI><P>A java.sql.Timestamp instance is returned with a nanosecond
 		value corresponding to yyyy-mm-dd hh:mm:ss.fffffffff according to
 		the time zone of the java virtual machine 
 		</P>
 		<LI><P>The toString() method of the returned value will return
-		&lsquo;yyyy-mm-dd hh:mm:ss.fffffffff&rsquo;. 
-		</P>
+		&lsquo;yyyy-mm-dd hh:mm:ss.fffffffff&rsquo;.</P>
 	</UL>
 	<LI><P>getTime() with a Calendar object 
 	</P>
-	<UL TYPE=CIRCLE>
+	<UL>
 		<LI><P>A java.sql.Time instance is returned with a nanosecond value
 		corresponding to yyyy-mm-dd hh:mm:ss.fffffffff according to the
 		time zone of the Calendar 
 		</P>
-	</UL>
-</UL>
-<OL START=2>
-	<UL TYPE=CIRCLE>
 		<LI><P>The toString() method of the returned value may not return
 		&lsquo;yyyy-mm-dd hh:mm:ss.fffffffff&rsquo;, since this method
 		always uses the time zone of the virtual machine. 
 		</P>
 	</UL>
 </OL>
-<H3>Conversion of a string type to a JDBC java.sql.Timestamp 
-</H3>
-<UL TYPE=DISC>
-	<LI><P>Two different timestamp formats are built into Derby.</P>
-</UL>
-<P CLASS="msonormal">1.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (ISO)
-yyyy-mm-dd hh:mm:ss[.ffffff]e.g. &ldquo;1980-10-25 13:01:23.123456&rdquo;,
-and</P>
-<P CLASS="msonormal">2.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; (IBM)
-yyyy-mm-dd-hh.mm.ss[.ffffff]e.g. &ldquo;1980-10-25-13.01.23.123456&rdquo;.</P>
-<UL TYPE=DISC>
-	<LI><P>Note that only microsecond resolution is supported in
-	converting strings to timestamps. 
-	</P>
-	<LI><P>If the format of the string matches one of the built in
-	formats then a conversion to a java.sql.Timestamp matches that of a
-	SQL TIMESTAMP value with value yyyy-mm-dd hh:mm:ss.ffffff. 
-	</P>
-</UL>
-<UL TYPE=DISC>
-	<LI><P>If the string does not match any of the built in formats
-	Derby attempts to use the Java locale specific parser to interpret
-	the string as a date. 
-	</P>
-</UL>
-<p><em>Last Updated: September 10, 2004</em></p>
+<H3>Conversion of a string type to a JDBC java.sql.Timestamp</H3>
+<P>Two different timestamp formats are built into Derby:</P>
+<OL>
+	<OL>
+		<LI><P>(ISO) yyyy-mm-dd hh:mm:ss[.ffffff]e.g. &ldquo;1980-10-25
+		13:01:23.123456&rdquo;, and</P>
+		<LI><P>(IBM) yyyy-mm-dd-hh.mm.ss[.ffffff]e.g.
+		&ldquo;1980-10-25-13.01.23.123456&rdquo;.</P>
+	</OL>
+</OL>
+<P>Note that only microsecond resolution is supported in converting
+strings to timestamps. 
+</P>
+<P>If the format of the string matches one of the built in formats
+then a conversion to a java.sql.Timestamp matches that of a SQL
+TIMESTAMP value with value yyyy-mm-dd hh:mm:ss.ffffff. 
+</P>
+<P>If the string does not match any of the built in formats Derby
+attempts to use the Java locale specific parser to interpret the
+string as a date. 
+</P>
+<P><EM>Last Updated: Dec 9, 2004</EM></P>
 </BODY>
-</HTML>=
+</HTML>

Modified: incubator/derby/site/trunk/src/documentation/content/xdocs/papers/derby_web.xml
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/content/xdocs/papers/derby_web.xml?view=diff&rev=111464&p1=incubator/derby/site/trunk/src/documentation/content/xdocs/papers/derby_web.xml&r1=111463&p2=incubator/derby/site/trunk/src/documentation/content/xdocs/papers/derby_web.xml&r2=111464
==============================================================================
--- incubator/derby/site/trunk/src/documentation/content/xdocs/papers/derby_web.xml	(original)
+++ incubator/derby/site/trunk/src/documentation/content/xdocs/papers/derby_web.xml	Thu Dec  9 20:16:53 2004
@@ -259,8 +259,17 @@
 <tr>
     <td> <code>src/documentation/resources/images</code></td>
     <td> Images. </td>
-    <td> Forrest copies these files without modifying them into 
-         <code>images</code> subdirectories to the files that reference them.
+    <td> Forrest copies an image file without modifying it into an
+         <code>images</code> subdirectory relative 
+	 to the file that references it.
+	 So, if file <code>foo.xml</code>
+	 links <code>images/something.jpg</code>,
+	 put <code>something.jpg</code> in
+	 <code>src/documentation/resources/images</code>.
+	 Forrest will create an <code>images</code> subdirectory where
+	 <code>foo.html</code> is output, 
+	 if a directory doesn't exist already, and will copy 
+	 <code>something.jpg</code> into that directory.
     </td>
 </tr>
 
@@ -268,7 +277,7 @@
 
 <p>
 The default directory structure 
-is markedly different for the src and build trees
+is quite different for the src and build trees
 (and the Derby web site uses default locations).
 Links in source files
 need to point to the name and the location of the target file in the build tree.
@@ -276,8 +285,8 @@
 
 <p>
 Two files in <code>src/documentation/content/xdocs</code>
-don't get output to the <code>build</code> tree, but control the information
-and links in the resulting navigation bar:
+don't get output to the <code>build</code> tree; 
+they control the information and links in the resulting navigation bar:
 </p>
 
 <ul>
@@ -346,13 +355,16 @@
 <title>5. Test the changes </title>
 
 <p>
-Test your changes by starting the Jetty webserver that is included in
+There are a couple ways (at least) to check changes.
+The first is to open <code>build/site/index.html</code> with your web browser.
+</p>
+
+<p>
+Another way is to start the Jetty webserver that is included in
 the Forrest distribution:
 </p>
 
-<source>
-forrest run
-</source>
+<source>forrest run</source>
 
 <p>
 After it starts, point your browser at
@@ -388,8 +400,7 @@
 <title>6. Commit changes to the src and build/site directories</title>
 
 <p>
-You need to check in the pages that were modified in both the
-<code>src</code> and
+Commit modified pages in the <code>src</code> and
 <code>build/site</code> trees.
 The '<code>forrest site</code>' command also outputs 
 <code>build/webapp</code> and
@@ -402,7 +413,7 @@
 </p>
 
 <p>
-If you add / delete a file, you must 'svn add' or 'svn delete' it in the
+If you add or delete a file, you must 'svn add' or 'svn delete' it in the
 <code>src</code> and
 <code>build/site</code> directory hierarchies.
 Do this after 'forrest site' has been run but 
@@ -410,6 +421,14 @@
 </p>
 
 <p>
+One more note about adding new text files.
+After you add the file to the repository
+set the end-of-line for the file to <code>native</code>:
+</p>
+
+<source>svn propset svn:eol-style native <em>filename</em></source>
+
+<p>
 When you're ready to commit,
 one way is to enter the command shown below
 from the directory that is one level above the
@@ -448,7 +467,7 @@
 
 </section>
 
-<p><em>Last updated November 24, 2004</em></p>
+<p><em>Last updated December 9, 2004</em></p>
 </section>
 
 </body>

Added: incubator/derby/site/trunk/src/documentation/resources/images/logo_entry_2.gif
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/resources/images/logo_entry_2.gif?view=auto&rev=111464
==============================================================================
Binary file. No diff available.

Added: incubator/derby/site/trunk/src/documentation/resources/images/logo_entry_3.gif
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/resources/images/logo_entry_3.gif?view=auto&rev=111464
==============================================================================
Binary file. No diff available.

Added: incubator/derby/site/trunk/src/documentation/resources/images/logo_entry_4.JPG
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/resources/images/logo_entry_4.JPG?view=auto&rev=111464
==============================================================================
Binary file. No diff available.

Added: incubator/derby/site/trunk/src/documentation/resources/images/logo_entry_5.jpg
Url: http://svn.apache.org/viewcvs/incubator/derby/site/trunk/src/documentation/resources/images/logo_entry_5.jpg?view=auto&rev=111464
==============================================================================
Binary file. No diff available.

Mime
View raw message