db-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r844160 [2/2] - in /websites/production/db/content/derby/docs/10.8: adminguide/ devguide/ getstart/ ref/ tools/ tuning/
Date Fri, 28 Dec 2012 20:22:57 GMT
Modified: websites/production/db/content/derby/docs/10.8/getstart/cgsusingtoolsutils.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/getstart/cgsusingtoolsutils.html (original)
+++ websites/production/db/content/derby/docs/10.8/getstart/cgsusingtoolsutils.html Fri Dec 28 20:22:56 2012
@@ -107,11 +107,11 @@ on how to use these system procedures ar
 <div>
 <ul class="ullinks">
 <li class="ulchildlink"><strong><a href="tgsrunningsysinfo.html">Running sysinfo</a></strong><br />
-The Derby??sysinfo tool displays information about your Java environment and your version of Derby.</li>
+The Derby sysinfo tool displays information about your Java environment and your version of Derby.</li>
 <li class="ulchildlink"><strong><a href="tgsrunningij.html">Running ij</a></strong><br />
-The Derby??ij tool is a JDBC tool that you can use to run scripts or interactive queries against a Derby database.</li>
+The Derby ij tool is a JDBC tool that you can use to run scripts or interactive queries against a Derby database.</li>
 <li class="ulchildlink"><strong><a href="tgsrunningdblook.html">Running dblook</a></strong><br />
-The Derby??dblook utility is a Data Definition Language (DDL) generation utility.</li>
+The Derby dblook utility is a Data Definition Language (DDL) generation utility.</li>
 </ul>
 
 <div class="familylinks">

Modified: websites/production/db/content/derby/docs/10.8/getstart/common.css
==============================================================================
--- websites/production/db/content/derby/docs/10.8/getstart/common.css (original)
+++ websites/production/db/content/derby/docs/10.8/getstart/common.css Fri Dec 28 20:22:56 2012
@@ -1,181 +1,181 @@
-/*
- | (c) Copyright IBM Corp. 2004, 2005 All Rights Reserved.
- */
-
-
-/* class definitions */
-
-.unresolved	{ background-color: skyblue;
-		}
-
-.noTemplate	{ background-color: yellow;
-		}
-
-.sidebar     {background: silver
-             }
-
-.toc         {font-size: small;
-		}
-
-.base		{ background-color: #ffffff;
-		}
-
-.figborder   { border-style: double;
-               border-color: black;
-               border-width: 3;
-             }
-
-
-/* the nested mappings provide the opportunity to manipulate things at the topic level */
-/* no function here for now; nested topics don't indent incrementally */
-.nested1	{ 
-		}
-
-.nested2	{ 
-		}
-
-.nested3	{ 
-		}
-
-.nested4	{ 
-		}
-
-.nested5	{ 
-		}
-
-.nested6	{ 
-		}
-
-
-
-/* the topictitle mappings provide nesting-specific title control */
-/* equivalent to FO xsl attribute sets for nested titles */
-
-.topictitle1 { margin-top: 0pc;
-		  margin-bottom: 1.4pt;
-		  font-size: 16pt;
-		  }
-
-.topictitle2 { margin-top: 1pc;
-               margin-bottom: 5pt;
-               font-size: 14pt;
-               }
-
-.topictitle3 { margin-top: 1pc;
-               margin-bottom: 2pt;
-               font-size: 14t;
-               font-weight: bold;
-             }
-
-.topictitle4 { margin-top: 10pt;
-               font-size: 14pt;
-               font-weight: bold;
-             }
-
-
-.topictitle5 { font-size: 14pt;
-               font-weight: bold;
-             }
-
-.topictitle6 { font-size: 15pt;
-               font-style: italic;
-             }
-
-/* some class settings tied to generated divs */
-div.notetitle { margin-top: 1em; font-weight: bold }
-div.notebody { margin-left: 2em }
-
-div.attention { margin-top: 1em }
-span.attentiontitle { font-weight: bold }
-div.dangertitle { margin-top: 1em; font-weight: bold }
-div.danger { padding: 5px 5px 5px 5px; border: solid; border-width: thin; font-weight: bold; margin-top: 2px }
-div.cautiontitle { margin-top: 1em; font-weight: bold }
-div.caution { font-weight: bold }
-
-div.tiptitle { margin-top: 1em; font-weight: bold }
-div.tipbody { margin-left: 2em }
-div.fastpathtitle { margin-top: 1em; font-weight: bold }
-div.fastpathbody { margin-left: 2em }
-div.importanttitle { margin-top: 1em; font-weight: bold }
-div.importantbody { margin-left: 2em }
-div.remembertitle { margin-top: 1em; font-weight: bold }
-div.rememberbody { margin-left: 2em }
-div.restrictiontitle { margin-top: 1em; font-weight: bold }
-div.restrictionbody { margin-left: 2em }
-
-div.imageleft { text-align: left }
-div.imagecenter { text-align: center }
-div.imageright { text-align: right }
-div.imagejustify { text-align: justify }
-
-
-
-/* format-specific */
-
-.bold		{ font-weight: bold;
-		}
-
-.boldItalic	{ font-weight: bold;
-		  font-style: italic;
-		}
-
-.italic		{ font-style: italic;
-		}
-
-		
-.underlined  { text-decoration: underline;
-		}
-
-.ptocH1      {font-size: x-small;
-		}
-
-.ptocH2      {font-size: x-small;
-		}
-
-.smallCaps   { text-transform: uppercase; 
-		  font-size: smaller;
-		}
-
-.stitle      { font-style: italic;
-		  text-decoration: underline;
-             }
-
-.nte		{}
-
-.defListHead	{ font-weight: bold;
-		  text-decoration: underline;
-		}
-
-.parmListKwd	{ font-weight: bold;
-		}
-
-.parmListVar	{ font-style: italic;
-		}
-
-.xxlines		{
-	white-space: pre;
-	font-family : serif;
-	font-size : 100%;
-}
-
-.pk          { font-weight: bold;
-		  text-decoration: underline;
-		}
-
-.sectiontitle {margin-top: 1em;
-               margin-bottom: 0em;
-               color: black;
-               font-size: 11pt;
-               font-weight: bold;
-              }
-
-
-*[compact="yes"]>li {
-  margin-top: 0pt;
-}
-
-*[compact="no"]>li {
-  margin-top: 6pt;
-}
-
-
+/*
+ | (c) Copyright IBM Corp. 2004, 2005 All Rights Reserved.
+ */
+
+
+/* class definitions */
+
+.unresolved	{ background-color: skyblue;
+		}
+
+.noTemplate	{ background-color: yellow;
+		}
+
+.sidebar     {background: silver
+             }
+
+.toc         {font-size: small;
+		}
+
+.base		{ background-color: #ffffff;
+		}
+
+.figborder   { border-style: double;
+               border-color: black;
+               border-width: 3;
+             }
+
+
+/* the nested mappings provide the opportunity to manipulate things at the topic level */
+/* no function here for now; nested topics don't indent incrementally */
+.nested1	{ 
+		}
+
+.nested2	{ 
+		}
+
+.nested3	{ 
+		}
+
+.nested4	{ 
+		}
+
+.nested5	{ 
+		}
+
+.nested6	{ 
+		}
+
+
+
+/* the topictitle mappings provide nesting-specific title control */
+/* equivalent to FO xsl attribute sets for nested titles */
+
+.topictitle1 { margin-top: 0pc;
+		  margin-bottom: 1.4pt;
+		  font-size: 16pt;
+		  }
+
+.topictitle2 { margin-top: 1pc;
+               margin-bottom: 5pt;
+               font-size: 14pt;
+               }
+
+.topictitle3 { margin-top: 1pc;
+               margin-bottom: 2pt;
+               font-size: 14t;
+               font-weight: bold;
+             }
+
+.topictitle4 { margin-top: 10pt;
+               font-size: 14pt;
+               font-weight: bold;
+             }
+
+
+.topictitle5 { font-size: 14pt;
+               font-weight: bold;
+             }
+
+.topictitle6 { font-size: 15pt;
+               font-style: italic;
+             }
+
+/* some class settings tied to generated divs */
+div.notetitle { margin-top: 1em; font-weight: bold }
+div.notebody { margin-left: 2em }
+
+div.attention { margin-top: 1em }
+span.attentiontitle { font-weight: bold }
+div.dangertitle { margin-top: 1em; font-weight: bold }
+div.danger { padding: 5px 5px 5px 5px; border: solid; border-width: thin; font-weight: bold; margin-top: 2px }
+div.cautiontitle { margin-top: 1em; font-weight: bold }
+div.caution { font-weight: bold }
+
+div.tiptitle { margin-top: 1em; font-weight: bold }
+div.tipbody { margin-left: 2em }
+div.fastpathtitle { margin-top: 1em; font-weight: bold }
+div.fastpathbody { margin-left: 2em }
+div.importanttitle { margin-top: 1em; font-weight: bold }
+div.importantbody { margin-left: 2em }
+div.remembertitle { margin-top: 1em; font-weight: bold }
+div.rememberbody { margin-left: 2em }
+div.restrictiontitle { margin-top: 1em; font-weight: bold }
+div.restrictionbody { margin-left: 2em }
+
+div.imageleft { text-align: left }
+div.imagecenter { text-align: center }
+div.imageright { text-align: right }
+div.imagejustify { text-align: justify }
+
+
+
+/* format-specific */
+
+.bold		{ font-weight: bold;
+		}
+
+.boldItalic	{ font-weight: bold;
+		  font-style: italic;
+		}
+
+.italic		{ font-style: italic;
+		}
+
+		
+.underlined  { text-decoration: underline;
+		}
+
+.ptocH1      {font-size: x-small;
+		}
+
+.ptocH2      {font-size: x-small;
+		}
+
+.smallCaps   { text-transform: uppercase; 
+		  font-size: smaller;
+		}
+
+.stitle      { font-style: italic;
+		  text-decoration: underline;
+             }
+
+.nte		{}
+
+.defListHead	{ font-weight: bold;
+		  text-decoration: underline;
+		}
+
+.parmListKwd	{ font-weight: bold;
+		}
+
+.parmListVar	{ font-style: italic;
+		}
+
+.xxlines		{
+	white-space: pre;
+	font-family : serif;
+	font-size : 100%;
+}
+
+.pk          { font-weight: bold;
+		  text-decoration: underline;
+		}
+
+.sectiontitle {margin-top: 1em;
+               margin-bottom: 0em;
+               color: black;
+               font-size: 11pt;
+               font-weight: bold;
+              }
+
+
+*[compact="yes"]>li {
+  margin-top: 0pt;
+}
+
+*[compact="no"]>li {
+  margin-top: 6pt;
+}
+
+

Modified: websites/production/db/content/derby/docs/10.8/getstart/commonltr.css
==============================================================================
--- websites/production/db/content/derby/docs/10.8/getstart/commonltr.css (original)
+++ websites/production/db/content/derby/docs/10.8/getstart/commonltr.css Fri Dec 28 20:22:56 2012
@@ -1,112 +1,112 @@
-/*
- | (c) Copyright IBM Corp. 2004, 2005 All Rights Reserved.
- */
- 
-.unresolved { background-color: skyblue; }
-.noTemplate { background-color: yellow; }
-
-.base { background-color: #ffffff; }
-
-/* Add space for top level topics */
-.nested0 { margin-top : 1em;}
-
-/* div with class=p is used for paragraphs that contain blocks, to keep the XHTML valid */
-.p {margin-top: 1em}
-
-/* Default of italics to set apart figure captions */
-.figcap { font-style: italic }
-.figdesc { font-style: normal }
-
-/* Use @frame to create frames on figures */
-.figborder { border-style: solid; padding-left : 3px; border-width : 2px; padding-right : 3px; margin-top: 1em; border-color : Silver;}
-.figsides { border-left : 2px solid; padding-left : 3px; border-right : 2px solid; padding-right : 3px; margin-top: 1em; border-color : Silver;}
-.figtop { border-top : 2px solid; margin-top: 1em; border-color : Silver;}
-.figbottom { border-bottom : 2px solid; border-color : Silver;}
-.figtopbot { border-top : 2px solid; border-bottom : 2px solid; margin-top: 1em; border-color : Silver;}
-
-/* Most link groups are created with <div>. Ensure they have space before and after. */
-.ullinks { list-style-type: none }
-.ulchildlink { margin-top: 1em; margin-bottom: 1em }
-.olchildlink { margin-top: 1em; margin-bottom: 1em }
-.linklist { margin-bottom: 1em }
-.linklistwithchild { margin-left: 1.5em; margin-bottom: 1em  }
-.sublinklist { margin-left: 1.5em; margin-bottom: 1em  }
-.relconcepts { margin-top: 1em; margin-bottom: 1em }
-.reltasks { margin-top: 1em; margin-bottom: 1em }
-.relref { margin-top: 1em; margin-bottom: 1em }
-.relinfo { margin-top: 1em; margin-bottom: 1em }
-.breadcrumb { font-size : smaller; margin-bottom: 1em }
-.prereq { margin-left : 20px;}
-
-/* Set heading sizes, getting smaller for deeper nesting */
-.topictitle1 { margin-top: 0pc; margin-bottom: .1em; font-size: 1.34em; }
-.topictitle2 { margin-top: 1pc; margin-bottom: .45em; font-size: 1.17em; }
-.topictitle3 { margin-top: 1pc; margin-bottom: .17em; font-size: 1.17em; font-weight: bold; }
-.topictitle4 { margin-top: .83em; font-size: 1.17em; font-weight: bold; }
-.topictitle5 { font-size: 1.17em; font-weight: bold; }
-.topictitle6 { font-size: 1.17em; font-style: italic; }
-.sectiontitle { margin-top: 1em; margin-bottom: 0em; color: black; font-size: 1.17em; font-weight: bold;}
-.section { margin-top: 1em; margin-bottom: 1em }
-.example { margin-top: 1em; margin-bottom: 1em }
-
-/* All note formats have the same default presentation */
-.note { margin-top: 1em; margin-bottom : 1em;}
-.notetitle { font-weight: bold }
-.notelisttitle { font-weight: bold }
-.tip { margin-top: 1em; margin-bottom : 1em;}
-.tiptitle { font-weight: bold }
-.fastpath { margin-top: 1em; margin-bottom : 1em;}
-.fastpathtitle { font-weight: bold }
-.important { margin-top: 1em; margin-bottom : 1em;}
-.importanttitle { font-weight: bold }
-.remember { margin-top: 1em; margin-bottom : 1em;}
-.remembertitle { font-weight: bold }
-.restriction { margin-top: 1em; margin-bottom : 1em;}
-.restrictiontitle { font-weight: bold }
-.attention { margin-top: 1em; margin-bottom : 1em;}
-.attentiontitle { font-weight: bold }
-.dangertitle { font-weight: bold }
-.danger { margin-top: 1em; margin-bottom : 1em;}
-.cautiontitle { font-weight: bold }
-.caution { font-weight: bold; margin-bottom : 1em; }
-
-/* Simple lists do not get a bullet */
-ul.simple { list-style-type: none }
-
-/* Used on the first column of a table, when rowheader="firstcol" is used */
-.firstcol { font-weight : bold;}
-
-/* Various basic phrase styles */
-.bold { font-weight: bold; }
-.boldItalic { font-weight: bold; font-style: italic; }
-.italic { font-style: italic; }
-.underlined { text-decoration: underline; }
-.uicontrol { font-weight: bold; }
-.parmname { font-weight: bold; }
-.kwd { font-weight: bold; }
-.defkwd { font-weight: bold; text-decoration: underline; }
-.var { font-style : italic;}
-.shortcut { text-decoration: underline; }
-
-/* Default of bold for definition list terms */
-.dlterm { font-weight: bold; }
-
-/* Use CSS to expand lists with @compact="no" */
-.dltermexpand { font-weight: bold; margin-top: 1em; }
-*[compact="yes"]>li { margin-top: 0em;}
-*[compact="no"]>li { margin-top: .53em;}	
-.liexpand { margin-top: 1em; margin-bottom: 1em }
-.sliexpand { margin-top: 1em; margin-bottom: 1em }
-.dlexpand { margin-top: 1em; margin-bottom: 1em }
-.ddexpand { margin-top: 1em; margin-bottom: 1em }
-.stepexpand { margin-top: 1em; margin-bottom: 1em }
-.substepexpand { margin-top: 1em; margin-bottom: 1em }
-
-/* Align images based on @align on topic/image */
-div.imageleft { text-align: left }
-div.imagecenter { text-align: center }
-div.imageright { text-align: right }
-div.imagejustify { text-align: justify }
-
-pre.screen { padding: 5px 5px 5px 5px; border: outset; background-color: #CCCCCC; margin-top: 2px; margin-bottom : 2px; white-space: pre}
-
+/*
+ | (c) Copyright IBM Corp. 2004, 2005 All Rights Reserved.
+ */
+ 
+.unresolved { background-color: skyblue; }
+.noTemplate { background-color: yellow; }
+
+.base { background-color: #ffffff; }
+
+/* Add space for top level topics */
+.nested0 { margin-top : 1em;}
+
+/* div with class=p is used for paragraphs that contain blocks, to keep the XHTML valid */
+.p {margin-top: 1em}
+
+/* Default of italics to set apart figure captions */
+.figcap { font-style: italic }
+.figdesc { font-style: normal }
+
+/* Use @frame to create frames on figures */
+.figborder { border-style: solid; padding-left : 3px; border-width : 2px; padding-right : 3px; margin-top: 1em; border-color : Silver;}
+.figsides { border-left : 2px solid; padding-left : 3px; border-right : 2px solid; padding-right : 3px; margin-top: 1em; border-color : Silver;}
+.figtop { border-top : 2px solid; margin-top: 1em; border-color : Silver;}
+.figbottom { border-bottom : 2px solid; border-color : Silver;}
+.figtopbot { border-top : 2px solid; border-bottom : 2px solid; margin-top: 1em; border-color : Silver;}
+
+/* Most link groups are created with <div>. Ensure they have space before and after. */
+.ullinks { list-style-type: none }
+.ulchildlink { margin-top: 1em; margin-bottom: 1em }
+.olchildlink { margin-top: 1em; margin-bottom: 1em }
+.linklist { margin-bottom: 1em }
+.linklistwithchild { margin-left: 1.5em; margin-bottom: 1em  }
+.sublinklist { margin-left: 1.5em; margin-bottom: 1em  }
+.relconcepts { margin-top: 1em; margin-bottom: 1em }
+.reltasks { margin-top: 1em; margin-bottom: 1em }
+.relref { margin-top: 1em; margin-bottom: 1em }
+.relinfo { margin-top: 1em; margin-bottom: 1em }
+.breadcrumb { font-size : smaller; margin-bottom: 1em }
+.prereq { margin-left : 20px;}
+
+/* Set heading sizes, getting smaller for deeper nesting */
+.topictitle1 { margin-top: 0pc; margin-bottom: .1em; font-size: 1.34em; }
+.topictitle2 { margin-top: 1pc; margin-bottom: .45em; font-size: 1.17em; }
+.topictitle3 { margin-top: 1pc; margin-bottom: .17em; font-size: 1.17em; font-weight: bold; }
+.topictitle4 { margin-top: .83em; font-size: 1.17em; font-weight: bold; }
+.topictitle5 { font-size: 1.17em; font-weight: bold; }
+.topictitle6 { font-size: 1.17em; font-style: italic; }
+.sectiontitle { margin-top: 1em; margin-bottom: 0em; color: black; font-size: 1.17em; font-weight: bold;}
+.section { margin-top: 1em; margin-bottom: 1em }
+.example { margin-top: 1em; margin-bottom: 1em }
+
+/* All note formats have the same default presentation */
+.note { margin-top: 1em; margin-bottom : 1em;}
+.notetitle { font-weight: bold }
+.notelisttitle { font-weight: bold }
+.tip { margin-top: 1em; margin-bottom : 1em;}
+.tiptitle { font-weight: bold }
+.fastpath { margin-top: 1em; margin-bottom : 1em;}
+.fastpathtitle { font-weight: bold }
+.important { margin-top: 1em; margin-bottom : 1em;}
+.importanttitle { font-weight: bold }
+.remember { margin-top: 1em; margin-bottom : 1em;}
+.remembertitle { font-weight: bold }
+.restriction { margin-top: 1em; margin-bottom : 1em;}
+.restrictiontitle { font-weight: bold }
+.attention { margin-top: 1em; margin-bottom : 1em;}
+.attentiontitle { font-weight: bold }
+.dangertitle { font-weight: bold }
+.danger { margin-top: 1em; margin-bottom : 1em;}
+.cautiontitle { font-weight: bold }
+.caution { font-weight: bold; margin-bottom : 1em; }
+
+/* Simple lists do not get a bullet */
+ul.simple { list-style-type: none }
+
+/* Used on the first column of a table, when rowheader="firstcol" is used */
+.firstcol { font-weight : bold;}
+
+/* Various basic phrase styles */
+.bold { font-weight: bold; }
+.boldItalic { font-weight: bold; font-style: italic; }
+.italic { font-style: italic; }
+.underlined { text-decoration: underline; }
+.uicontrol { font-weight: bold; }
+.parmname { font-weight: bold; }
+.kwd { font-weight: bold; }
+.defkwd { font-weight: bold; text-decoration: underline; }
+.var { font-style : italic;}
+.shortcut { text-decoration: underline; }
+
+/* Default of bold for definition list terms */
+.dlterm { font-weight: bold; }
+
+/* Use CSS to expand lists with @compact="no" */
+.dltermexpand { font-weight: bold; margin-top: 1em; }
+*[compact="yes"]>li { margin-top: 0em;}
+*[compact="no"]>li { margin-top: .53em;}	
+.liexpand { margin-top: 1em; margin-bottom: 1em }
+.sliexpand { margin-top: 1em; margin-bottom: 1em }
+.dlexpand { margin-top: 1em; margin-bottom: 1em }
+.ddexpand { margin-top: 1em; margin-bottom: 1em }
+.stepexpand { margin-top: 1em; margin-bottom: 1em }
+.substepexpand { margin-top: 1em; margin-bottom: 1em }
+
+/* Align images based on @align on topic/image */
+div.imageleft { text-align: left }
+div.imagecenter { text-align: center }
+div.imageright { text-align: right }
+div.imagejustify { text-align: justify }
+
+pre.screen { padding: 5px 5px 5px 5px; border: outset; background-color: #CCCCCC; margin-top: 2px; margin-bottom : 2px; white-space: pre}
+

Modified: websites/production/db/content/derby/docs/10.8/getstart/commonrtl.css
==============================================================================
--- websites/production/db/content/derby/docs/10.8/getstart/commonrtl.css (original)
+++ websites/production/db/content/derby/docs/10.8/getstart/commonrtl.css Fri Dec 28 20:22:56 2012
@@ -1,113 +1,113 @@
-/*
- | (c) Copyright IBM Corp. 2004, 2005 All Rights Reserved.
- */
- 
-.unresolved { background-color: skyblue; }
-.noTemplate { background-color: yellow; }
-
-.base { background-color: #ffffff; }
-
-/* Add space for top level topics */
-.nested0 { margin-top : 1em;}
-
-/* div with class=p is used for paragraphs that contain blocks, to keep the XHTML valid */
-.p {margin-top: 1em}
-
-/* Default of italics to set apart figure captions */
-.figcap { font-style: italic }
-.figdesc { font-style: normal }
-
-/* Use @frame to create frames on figures */
-.figborder { border-style: solid; padding-left : 3px; border-width : 2px; padding-right : 3px; margin-top: 1em; border-color : Silver;}
-.figsides { border-left : 2px solid; padding-left : 3px; border-right : 2px solid; padding-right : 3px; margin-top: 1em; border-color : Silver;}
-.figtop { border-top : 2px solid; margin-top: 1em; border-color : Silver;}
-.figbottom { border-bottom : 2px solid; border-color : Silver;}
-.figtopbot { border-top : 2px solid; border-bottom : 2px solid; margin-top: 1em; border-color : Silver;}
-
-/* Most link groups are created with <div>. Ensure they have space before and after. */
-.ullinks { list-style-type: none }
-.ulchildlink { margin-top: 1em; margin-bottom: 1em }
-.olchildlink { margin-top: 1em; margin-bottom: 1em }
-.linklist { margin-top: 1em; margin-bottom: 1em }
-.linklistwithchild { margin-top: 1em; margin-right: 1.5em; margin-bottom: 1em  }
-.sublinklist { margin-top: 1em; margin-right: 1.5em; margin-bottom: 1em  }
-.relconcepts { margin-top: 1em; margin-bottom: 1em }
-.reltasks { margin-top: 1em; margin-bottom: 1em }
-.relref { margin-top: 1em; margin-bottom: 1em }
-.relinfo { margin-top: 1em; margin-bottom: 1em }
-.breadcrumb { font-size : smaller; margin-bottom: 1em }
-.prereq { margin-right : 20px;}
-
-/* Set heading sizes, getting smaller for deeper nesting */
-.topictitle1 { margin-top: 0pc; margin-bottom: .1em; font-size: 1.34em; }
-.topictitle2 { margin-top: 1pc; margin-bottom: .45em; font-size: 1.17em; }
-.topictitle3 { margin-top: 1pc; margin-bottom: .17em; font-size: 1.17em; font-weight: bold; }
-.topictitle4 { margin-top: .83em; font-size: 1.17em; font-weight: bold; }
-.topictitle5 { font-size: 1.17em; font-weight: bold; }
-.topictitle6 { font-size: 1.17em; font-style: italic; }
-.sectiontitle { margin-top: 1em; margin-bottom: 0em; color: black; font-size: 1.17em; font-weight: bold;}
-.section { margin-top: 1em; margin-bottom: 1em }
-.example { margin-top: 1em; margin-bottom: 1em }
-
-/* All note formats have the same default presentation */
-.note { margin-top: 1em; margin-bottom : 1em;}
-.notetitle { font-weight: bold }
-.notelisttitle { font-weight: bold }
-.tip { margin-top: 1em; margin-bottom : 1em;}
-.tiptitle { font-weight: bold }
-.fastpath { margin-top: 1em; margin-bottom : 1em;}
-.fastpathtitle { font-weight: bold }
-.important { margin-top: 1em; margin-bottom : 1em;}
-.importanttitle { font-weight: bold }
-.remember { margin-top: 1em; margin-bottom : 1em;}
-.remembertitle { font-weight: bold }
-.restriction { margin-top: 1em; margin-bottom : 1em;}
-.restrictiontitle { font-weight: bold }
-.attention { margin-top: 1em; margin-bottom : 1em;}
-.attentiontitle { font-weight: bold }
-.dangertitle { font-weight: bold }
-.danger { margin-top: 1em; margin-bottom : 1em;}
-.cautiontitle { font-weight: bold }
-.caution { font-weight: bold; margin-bottom : 1em; }
-
-/* Simple lists do not get a bullet */
-ul.simple { list-style-type: none }
-
-/* Used on the first column of a table, when rowheader="firstcol" is used */
-.firstcol { font-weight : bold;}
-
-/* Various basic phrase styles */
-.bold { font-weight: bold; }
-.boldItalic { font-weight: bold; font-style: italic; }
-.italic { font-style: italic; }
-.underlined { text-decoration: underline; }
-.uicontrol { font-weight: bold; }
-.parmname { font-weight: bold; }
-.kwd { font-weight: bold; }
-.defkwd { font-weight: bold; text-decoration: underline; }
-.var { font-style : italic;}
-.shortcut { text-decoration: underline; }
-
-/* Default of bold for definition list terms */
-.dlterm { font-weight: bold; }
-
-/* Use CSS to expand lists with @compact="no" */
-.dltermexpand { font-weight: bold; margin-top: 1em; }
-*[compact="yes"]>li { margin-top: 0em;}
-*[compact="no"]>li { margin-top: .53em;}
-.liexpand { margin-top: 1em; margin-bottom: 1em }
-.sliexpand { margin-top: 1em; margin-bottom: 1em }
-.dlexpand { margin-top: 1em; margin-bottom: 1em }
-.ddexpand { margin-top: 1em; margin-bottom: 1em }
-.stepexpand { margin-top: 1em; margin-bottom: 1em }
-.substepexpand { margin-top: 1em; margin-bottom: 1em }
-
-/* Align images based on @align on topic/image */
-div.imageleft { text-align: left }
-div.imagecenter { text-align: center }
-div.imageright { text-align: right }
-div.imagejustify { text-align: justify }
-
-pre.screen { padding: 5px 5px 5px 5px; border: outset; background-color: #CCCCCC; margin-top: 2px; margin-bottom : 2px; white-space: pre}
-
-
+/*
+ | (c) Copyright IBM Corp. 2004, 2005 All Rights Reserved.
+ */
+ 
+.unresolved { background-color: skyblue; }
+.noTemplate { background-color: yellow; }
+
+.base { background-color: #ffffff; }
+
+/* Add space for top level topics */
+.nested0 { margin-top : 1em;}
+
+/* div with class=p is used for paragraphs that contain blocks, to keep the XHTML valid */
+.p {margin-top: 1em}
+
+/* Default of italics to set apart figure captions */
+.figcap { font-style: italic }
+.figdesc { font-style: normal }
+
+/* Use @frame to create frames on figures */
+.figborder { border-style: solid; padding-left : 3px; border-width : 2px; padding-right : 3px; margin-top: 1em; border-color : Silver;}
+.figsides { border-left : 2px solid; padding-left : 3px; border-right : 2px solid; padding-right : 3px; margin-top: 1em; border-color : Silver;}
+.figtop { border-top : 2px solid; margin-top: 1em; border-color : Silver;}
+.figbottom { border-bottom : 2px solid; border-color : Silver;}
+.figtopbot { border-top : 2px solid; border-bottom : 2px solid; margin-top: 1em; border-color : Silver;}
+
+/* Most link groups are created with <div>. Ensure they have space before and after. */
+.ullinks { list-style-type: none }
+.ulchildlink { margin-top: 1em; margin-bottom: 1em }
+.olchildlink { margin-top: 1em; margin-bottom: 1em }
+.linklist { margin-top: 1em; margin-bottom: 1em }
+.linklistwithchild { margin-top: 1em; margin-right: 1.5em; margin-bottom: 1em  }
+.sublinklist { margin-top: 1em; margin-right: 1.5em; margin-bottom: 1em  }
+.relconcepts { margin-top: 1em; margin-bottom: 1em }
+.reltasks { margin-top: 1em; margin-bottom: 1em }
+.relref { margin-top: 1em; margin-bottom: 1em }
+.relinfo { margin-top: 1em; margin-bottom: 1em }
+.breadcrumb { font-size : smaller; margin-bottom: 1em }
+.prereq { margin-right : 20px;}
+
+/* Set heading sizes, getting smaller for deeper nesting */
+.topictitle1 { margin-top: 0pc; margin-bottom: .1em; font-size: 1.34em; }
+.topictitle2 { margin-top: 1pc; margin-bottom: .45em; font-size: 1.17em; }
+.topictitle3 { margin-top: 1pc; margin-bottom: .17em; font-size: 1.17em; font-weight: bold; }
+.topictitle4 { margin-top: .83em; font-size: 1.17em; font-weight: bold; }
+.topictitle5 { font-size: 1.17em; font-weight: bold; }
+.topictitle6 { font-size: 1.17em; font-style: italic; }
+.sectiontitle { margin-top: 1em; margin-bottom: 0em; color: black; font-size: 1.17em; font-weight: bold;}
+.section { margin-top: 1em; margin-bottom: 1em }
+.example { margin-top: 1em; margin-bottom: 1em }
+
+/* All note formats have the same default presentation */
+.note { margin-top: 1em; margin-bottom : 1em;}
+.notetitle { font-weight: bold }
+.notelisttitle { font-weight: bold }
+.tip { margin-top: 1em; margin-bottom : 1em;}
+.tiptitle { font-weight: bold }
+.fastpath { margin-top: 1em; margin-bottom : 1em;}
+.fastpathtitle { font-weight: bold }
+.important { margin-top: 1em; margin-bottom : 1em;}
+.importanttitle { font-weight: bold }
+.remember { margin-top: 1em; margin-bottom : 1em;}
+.remembertitle { font-weight: bold }
+.restriction { margin-top: 1em; margin-bottom : 1em;}
+.restrictiontitle { font-weight: bold }
+.attention { margin-top: 1em; margin-bottom : 1em;}
+.attentiontitle { font-weight: bold }
+.dangertitle { font-weight: bold }
+.danger { margin-top: 1em; margin-bottom : 1em;}
+.cautiontitle { font-weight: bold }
+.caution { font-weight: bold; margin-bottom : 1em; }
+
+/* Simple lists do not get a bullet */
+ul.simple { list-style-type: none }
+
+/* Used on the first column of a table, when rowheader="firstcol" is used */
+.firstcol { font-weight : bold;}
+
+/* Various basic phrase styles */
+.bold { font-weight: bold; }
+.boldItalic { font-weight: bold; font-style: italic; }
+.italic { font-style: italic; }
+.underlined { text-decoration: underline; }
+.uicontrol { font-weight: bold; }
+.parmname { font-weight: bold; }
+.kwd { font-weight: bold; }
+.defkwd { font-weight: bold; text-decoration: underline; }
+.var { font-style : italic;}
+.shortcut { text-decoration: underline; }
+
+/* Default of bold for definition list terms */
+.dlterm { font-weight: bold; }
+
+/* Use CSS to expand lists with @compact="no" */
+.dltermexpand { font-weight: bold; margin-top: 1em; }
+*[compact="yes"]>li { margin-top: 0em;}
+*[compact="no"]>li { margin-top: .53em;}
+.liexpand { margin-top: 1em; margin-bottom: 1em }
+.sliexpand { margin-top: 1em; margin-bottom: 1em }
+.dlexpand { margin-top: 1em; margin-bottom: 1em }
+.ddexpand { margin-top: 1em; margin-bottom: 1em }
+.stepexpand { margin-top: 1em; margin-bottom: 1em }
+.substepexpand { margin-top: 1em; margin-bottom: 1em }
+
+/* Align images based on @align on topic/image */
+div.imageleft { text-align: left }
+div.imagecenter { text-align: center }
+div.imageright { text-align: right }
+div.imagejustify { text-align: justify }
+
+pre.screen { padding: 5px 5px 5px 5px; border: outset; background-color: #CCCCCC; margin-top: 2px; margin-bottom : 2px; white-space: pre}
+
+

Modified: websites/production/db/content/derby/docs/10.8/getstart/cwwdactivities.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/getstart/cwwdactivities.html (original)
+++ websites/production/db/content/derby/docs/10.8/getstart/cwwdactivities.html Fri Dec 28 20:22:56 2012
@@ -52,7 +52,7 @@ feature of  <span>Derby</span>. </p>
 <dl>
 <dt class="dlterm">Activity 1:</dt>
 
-<dd>Use the  <span>Derby</span>??<samp class="codeph">ij</samp> tool
+<dd>Use the  <span>Derby</span> <samp class="codeph">ij</samp> tool
 to load the <span>Derby</span> embedded
 driver and start the  <span>Derby</span> database
 engine.  Create the database <samp class="codeph">firstdb</samp> and the table <samp class="codeph">FIRSTTABLE</samp>.
@@ -66,7 +66,7 @@ introduced.</dd>
 <dd>Use <span>Derby</span> within a client/server
 configuration. Start the <span>Derby</span> Network
 Server, which will embed the <span>Derby</span> engine.
- In a separate process, use the <span>Derby</span>??<samp class="codeph">ij</samp> 
+ In a separate process, use the <span>Derby</span> <samp class="codeph">ij</samp> 
 tool to load the <span>Derby</span> client
 driver and connect to the Network Server. Create a database called  <samp class="codeph">seconddb</samp> and
 the table <samp class="codeph">SECONDTABLE</samp>. Use a few  basic SQL statements to

Modified: websites/production/db/content/derby/docs/10.8/getstart/getstartderby.pdf
==============================================================================
Binary files - no diff available.

Modified: websites/production/db/content/derby/docs/10.8/getstart/rgsdocs10012.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/getstart/rgsdocs10012.html (original)
+++ websites/production/db/content/derby/docs/10.8/getstart/rgsdocs10012.html Fri Dec 28 20:22:56 2012
@@ -86,7 +86,7 @@ special meaning in some SQL statements.<
 <td valign="top" width="30%" headers="N10057"><samp class="codeph">{ }</samp></td>
 
 <td valign="top" width="70%" headers="N1005E">Groups items so that they can be marked with one of the
-symbols <samp class="codeph">[??]</samp>, <samp class="codeph">|</samp>, or <samp class="codeph">*</samp>.</td>
+symbols <samp class="codeph">[ ]</samp>, <samp class="codeph">|</samp>, or <samp class="codeph">*</samp>.</td>
 
 </tr>
 

Modified: websites/production/db/content/derby/docs/10.8/getstart/tgsrunningdblook.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/getstart/tgsrunningdblook.html (original)
+++ websites/production/db/content/derby/docs/10.8/getstart/tgsrunningdblook.html Fri Dec 28 20:22:56 2012
@@ -26,8 +26,8 @@
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
 <meta content="task" name="DC.Type" />
 <meta name="DC.Title" content="Running dblook" />
-<meta name="abstract" content="The Derby??dblook utility is a Data Definition Language (DDL) generation utility." />
-<meta name="description" content="The Derby??dblook utility is a Data Definition Language (DDL) generation utility." />
+<meta name="abstract" content="The Derby dblook utility is a Data Definition Language (DDL) generation utility." />
+<meta name="description" content="The Derby dblook utility is a Data Definition Language (DDL) generation utility." />
 <meta content="tools, dblook, Derby, running, utilities, dblook, dblook tool" name="DC.subject" />
 <meta content="tools, dblook, Derby, running, utilities, dblook, dblook tool" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="cgsusingtoolsutils.html" />
@@ -44,7 +44,7 @@
 
 
 
-<div><p>The <span>Derby</span>??<samp class="codeph">dblook</samp> utility
+<div><p>The <span>Derby</span> <samp class="codeph">dblook</samp> utility
 is a Data Definition Language (DDL) generation utility.</p>
 
 <div class="section"><p>The <samp class="codeph">dblook</samp> utility is a simple utility that dumps

Modified: websites/production/db/content/derby/docs/10.8/getstart/tgsrunningij.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/getstart/tgsrunningij.html (original)
+++ websites/production/db/content/derby/docs/10.8/getstart/tgsrunningij.html Fri Dec 28 20:22:56 2012
@@ -26,8 +26,8 @@
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
 <meta content="task" name="DC.Type" />
 <meta name="DC.Title" content="Running ij" />
-<meta name="abstract" content="The Derby??ij tool is a JDBC tool that you can use to run scripts or interactive queries against a Derby database." />
-<meta name="description" content="The Derby??ij tool is a JDBC tool that you can use to run scripts or interactive queries against a Derby database." />
+<meta name="abstract" content="The Derby ij tool is a JDBC tool that you can use to run scripts or interactive queries against a Derby database." />
+<meta name="description" content="The Derby ij tool is a JDBC tool that you can use to run scripts or interactive queries against a Derby database." />
 <meta content="tools, ij, Derby, running, ij tool" name="DC.subject" />
 <meta content="tools, ij, Derby, running, ij tool" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="cgsusingtoolsutils.html" />
@@ -44,7 +44,7 @@
 
 
 
-<div><p>The <span>Derby</span>??<samp class="codeph">ij</samp> tool
+<div><p>The <span>Derby</span> <samp class="codeph">ij</samp> tool
 is a JDBC tool that you can use to run scripts or interactive queries against
 a <span>Derby</span> database.</p>
 

Modified: websites/production/db/content/derby/docs/10.8/getstart/tgsrunningsysinfo.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/getstart/tgsrunningsysinfo.html (original)
+++ websites/production/db/content/derby/docs/10.8/getstart/tgsrunningsysinfo.html Fri Dec 28 20:22:56 2012
@@ -26,8 +26,8 @@
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
 <meta content="task" name="DC.Type" />
 <meta name="DC.Title" content="Running sysinfo" />
-<meta name="abstract" content="The Derby??sysinfo tool displays information about your Java environment and your version of Derby." />
-<meta name="description" content="The Derby??sysinfo tool displays information about your Java environment and your version of Derby." />
+<meta name="abstract" content="The Derby sysinfo tool displays information about your Java environment and your version of Derby." />
+<meta name="description" content="The Derby sysinfo tool displays information about your Java environment and your version of Derby." />
 <meta content="tools, sysinfo, Derby, utilities, sysinfo, running, sysinfo tool" name="DC.subject" />
 <meta content="tools, sysinfo, Derby, utilities, sysinfo, running, sysinfo tool" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="cgsusingtoolsutils.html" />
@@ -44,7 +44,7 @@
 
 
 
-<div><p>The <span>Derby</span>??<samp class="codeph">sysinfo</samp> tool
+<div><p>The <span>Derby</span> <samp class="codeph">sysinfo</samp> tool
 displays information about your Java environment and your version of <span>Derby</span>.</p>
 
 <div class="section">The <samp class="codeph">sysinfo</samp> utility prints system information to

Modified: websites/production/db/content/derby/docs/10.8/getstart/tgssetupverify.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/getstart/tgssetupverify.html (original)
+++ websites/production/db/content/derby/docs/10.8/getstart/tgssetupverify.html Fri Dec 28 20:22:56 2012
@@ -68,7 +68,7 @@ produces an error or the version listed 
 before continuing.</li>
 
 <li class="stepexpand"><span>Verify that the  <span>DERBY_HOME</span> 
-environment variable is set and points to the root directory of the  <span>Derby</span>??<span>10.8</span>  installation. Open
+environment variable is set and points to the root directory of the  <span>Derby</span> <span>10.8</span>  installation. Open
 a command window and run the appropriate command for your system. </span> If
 you installed <span>Derby</span> in
 the /opt/<span>Derby_10</span> directory

Modified: websites/production/db/content/derby/docs/10.8/getstart/twwdactivity1.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/getstart/twwdactivity1.html (original)
+++ websites/production/db/content/derby/docs/10.8/getstart/twwdactivity1.html Fri Dec 28 20:22:56 2012
@@ -26,8 +26,8 @@
 <meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
 <meta content="task" name="DC.Type" />
 <meta name="DC.Title" content="Creating a Derby database and running SQL statements" />
-<meta name="abstract" content="Now, you will use the Derby??ij tool to load the Derby database engine. You will use the Derby embedded driver to create and connect to the firstdb database. You will also use a few basic SQL statements to create and populate a table." />
-<meta name="description" content="Now, you will use the Derby??ij tool to load the Derby database engine. You will use the Derby embedded driver to create and connect to the firstdb database. You will also use a few basic SQL statements to create and populate a table." />
+<meta name="abstract" content="Now, you will use the Derby ij tool to load the Derby database engine. You will use the Derby embedded driver to create and connect to the firstdb database. You will also use a few basic SQL statements to create and populate a table." />
+<meta name="description" content="Now, you will use the Derby ij tool to load the Derby database engine. You will use the Derby embedded driver to create and connect to the firstdb database. You will also use a few basic SQL statements to create and populate a table." />
 <meta content="Connection URL, embedded driver, create=true, ij, Database, creating, connecting to, Derby, logfile, message and error, SQL, create table, insert, select" name="DC.subject" />
 <meta content="Connection URL, embedded driver, create=true, ij, Database, creating, connecting to, Derby, logfile, message and error, SQL, create table, insert, select" name="keywords" />
 <meta scheme="URI" name="DC.Relation" content="twwdactivity1_overview.html" />
@@ -44,14 +44,14 @@
 
 
 
-<div><p> Now, you will use the  <span>Derby</span>??<samp class="codeph">ij</samp> 
+<div><p> Now, you will use the  <span>Derby</span> <samp class="codeph">ij</samp> 
 tool to load the <span>Derby</span> 
 database engine. You will use the  <span>Derby</span> embedded
 driver to create and connect to the <samp class="codeph">firstdb</samp> database. You
 will also use a few basic SQL statements to create and populate a table. </p>
 
 <ol>
-<li class="stepexpand"><span>Run the  <span>Derby</span>??<samp class="codeph">ij</samp> 
+<li class="stepexpand"><span>Run the  <span>Derby</span> <samp class="codeph">ij</samp> 
 tool. </span> <div class="p">If you included the <samp class="codeph">DERBY_HOME/bin</samp> directory
 in your PATH environment variable, type: <pre>ij</pre>
  Otherwise,
@@ -126,7 +126,7 @@ is specified, the database is created in
 
 <dt class="dlterm"><samp class="codeph">;create=true</samp></dt>
 
-<dd>The <span>Derby</span>??<var class="varname">URL
+<dd>The <span>Derby</span> <var class="varname">URL
 attribute</var> that is used to create a database.  <span>Derby</span> does
 not have an SQL  <samp class="codeph">create database</samp> command.</dd>
 
@@ -228,6 +228,9 @@ Loaded from file:C:\db-derby-10.8.0.0-bi
 java.vendor=Sun Microsystems Inc.
 java.runtime.version=1.6.0_24-b07
 user.dir=C:\DERBYTUTOR
+os.name=Windows XP
+os.arch=x86
+os.version=5.1
 derby.system.home=C:\DERBYTUTOR
 Database Class Loader started - derby.database.classpath=''
 ----------------------------------------------------------------

Modified: websites/production/db/content/derby/docs/10.8/getstart/twwdactivity1_Setup.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/getstart/twwdactivity1_Setup.html (original)
+++ websites/production/db/content/derby/docs/10.8/getstart/twwdactivity1_Setup.html Fri Dec 28 20:22:56 2012
@@ -138,7 +138,7 @@ following table.</span> 
 </li>
 
 <li class="stepexpand"><span>Copy the SQL scripts from the
-<span>Derby</span>??
+<span>Derby</span> 
 <samp class="codeph">demo\programs\toursdb</samp> subdirectory into the
 <samp class="codeph">DERBYTUTOR</samp> directory, as shown in the following table. You will
 use these scripts to create tables and add data to a new database,
@@ -207,7 +207,7 @@ directory, as shown in the following tab
 <tr>
 <td valign="top" width="25%" headers="N102A0">UNIX (Korn Shell)</td>
 
-<td valign="top" width="75%" headers="N102A7"><pre><strong><kbd class="userinput">ls DERBYTUTOR</kbd></strong></pre>
+<td valign="top" width="75%" headers="N102A7"><pre><strong><kbd class="userinput">ls</kbd></strong></pre>
 </td>
 
 </tr>
@@ -215,7 +215,7 @@ directory, as shown in the following tab
 <tr>
 <td valign="top" width="25%" headers="N102A0">Windows</td>
 
-<td valign="top" width="75%" headers="N102A7"><pre><strong><kbd class="userinput">dir DERBYTUTOR</kbd></strong></pre>
+<td valign="top" width="75%" headers="N102A7"><pre><strong><kbd class="userinput">dir</kbd></strong></pre>
 </td>
 
 </tr>

Modified: websites/production/db/content/derby/docs/10.8/getstart/twwdactivity1_overview.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/getstart/twwdactivity1_overview.html (original)
+++ websites/production/db/content/derby/docs/10.8/getstart/twwdactivity1_overview.html Fri Dec 28 20:22:56 2012
@@ -65,7 +65,7 @@ and run SQL statements</a></span></li>
 <li class="ulchildlink"><strong><a href="twwdactivity1_Setup.html">Creating a directory and copying scripts into the directory</a></strong><br />
 To help you complete this activity, you must create a directory and copy several scripts into the new directory. You will use these scripts to quickly add tables and data to a new Derby database.</li>
 <li class="ulchildlink"><strong><a href="twwdactivity1.html">Creating a Derby database and running SQL statements</a></strong><br />
-Now, you will use the Derby??ij tool to load the Derby database engine. You will use the Derby embedded driver to create and connect to the firstdb database. You will also use a few basic SQL statements to create and populate a table.</li>
+Now, you will use the Derby ij tool to load the Derby database engine. You will use the Derby embedded driver to create and connect to the firstdb database. You will also use a few basic SQL statements to create and populate a table.</li>
 </ul>
 
 <div class="familylinks">

Modified: websites/production/db/content/derby/docs/10.8/ref/refderby.pdf
==============================================================================
Binary files - no diff available.

Modified: websites/production/db/content/derby/docs/10.8/ref/rrefattrib15290.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/ref/rrefattrib15290.html (original)
+++ websites/production/db/content/derby/docs/10.8/ref/rrefattrib15290.html Fri Dec 28 20:22:56 2012
@@ -48,11 +48,29 @@ For information about data encryption, s
 in the <cite><span><em>Derby Developer's Guide</em></span></cite>.</p>
  </div>
 
-<div class="section"><h2 class="sectiontitle">Combining with other attributes</h2><p>The <em>dataEncryption</em> attribute
-must be combined with the <em><a href="rrefattrib42100.html#rrefattrib42100">bootPassword=key</a></em> attribute
-or the <a href="rrefattribnewencryptkey.html#rrefattribnewencryptkey">newEncryptionKey=key</a> attribute.
-You have the option of also specifying the <em><a href="rrefattrib88843.html#rrefattrib88843">encryptionProvider=providerName</a></em> and <em><a href="rrefattrib60346.html#rrefattrib60346">encryptionAlgorithm=algorithm</a></em> attributes.</p>
- 
+<div class="section"><h2 class="sectiontitle">Combining with other attributes</h2>
+<p>The <em>dataEncryption=true</em> attribute must be combined with either the
+<em><a href="rrefattrib42100.html#rrefattrib42100">bootPassword=key</a></em>
+attribute or the
+<em><a href="rrefattribencryptkey.html#rrefattribencryptkey">encryptionKey=key</a></em>
+attribute.</p>
+
+<p>With either <em>bootPassword=key</em> or <em>encryptionKey=key</em>, you have the
+option of also specifying the
+<em><a href="rrefattrib88843.html#rrefattrib88843">encryptionProvider=providerName</a></em>,
+<em><a href="rrefattrib60346.html#rrefattrib60346">encryptionAlgorithm=algorithm</a></em>,
+and/or <em><a href="rrefattribencryptkeylength.html#rrefattribencryptkeylength">encryptionKeyLength=length</a></em>
+attributes.</p>
+
+<p>An encryption key and a boot password use different storage mechanisms, so
+if, for example, you create a database using a boot password, you must continue
+to specify a boot password when you boot the database; you cannot switch to an
+encryption key. You can change either the boot password or the encryption key
+by specifying
+<em><a href="rrefattribnewbootpw.html#rrefattribnewbootpw">newBootPassword=newPassword</a></em>
+or
+<em><a href="rrefattribnewencryptkey.html#rrefattribnewencryptkey">newEncryptionKey=key</a></em>.</p>
+
 <p>
   For an existing, unencrypted database for which authentication
   and SQL authorization are both
@@ -67,11 +85,11 @@ You have the option of also specifying t
 
 </div>
 
-<div class="example"><h2 class="sectiontitle">Examples</h2><pre><strong><span> -- encrypt a new database</span>
+<div class="example"><h2 class="sectiontitle">Examples</h2><pre><strong><span>-- encrypt a new database</span>
 jdbc:derby:encryptedDB;create=true;dataEncryption=true;
     bootPassword=cLo4u922sc23aPe
- <span>-- configure an existing unencrypted database for encryption </span>
-   jdbc:derby:salesdb;dataEncryption=true;bootPassword=cLo4u922sc23aPe 
+<span>-- configure an existing unencrypted database for encryption </span>
+jdbc:derby:salesdb;dataEncryption=true;bootPassword=cLo4u922sc23aPe 
 </strong></pre>
  </div>
 

Modified: websites/production/db/content/derby/docs/10.8/ref/rrefattrib24612.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/ref/rrefattrib24612.html (original)
+++ websites/production/db/content/derby/docs/10.8/ref/rrefattrib24612.html Fri Dec 28 20:22:56 2012
@@ -37,12 +37,13 @@
 <meta scheme="URI" name="DC.Relation" content="rrefattribderegister.html" />
 <meta scheme="URI" name="DC.Relation" content="rrefattribdrop.html" />
 <meta scheme="URI" name="DC.Relation" content="rrefattribencryptkey.html" />
+<meta scheme="URI" name="DC.Relation" content="rrefattribencryptkeylength.html" />
 <meta scheme="URI" name="DC.Relation" content="rrefattrib88843.html" />
 <meta scheme="URI" name="DC.Relation" content="rrefattrib60346.html" />
 <meta scheme="URI" name="DC.Relation" content="rrefattribfailover.html" />
 <meta scheme="URI" name="DC.Relation" content="rrefattrib72457.html" />
-<meta scheme="URI" name="DC.Relation" content="rrefattribnewencryptkey.html" />
 <meta scheme="URI" name="DC.Relation" content="rrefattribnewbootpw.html" />
+<meta scheme="URI" name="DC.Relation" content="rrefattribnewencryptkey.html" />
 <meta scheme="URI" name="DC.Relation" content="rrefattrib42686.html" />
 <meta scheme="URI" name="DC.Relation" content="rrefrestorefrom.html" />
 <meta scheme="URI" name="DC.Relation" content="rrefattribretrievemsgtext.html" />
@@ -115,6 +116,8 @@ an incorrect attribute or corresponding 
 </li>
 <li class="ulchildlink"><strong><a href="rrefattribencryptkey.html">encryptionKey=key attribute</a></strong><br />
 </li>
+<li class="ulchildlink"><strong><a href="rrefattribencryptkeylength.html">encryptionKeyLength=length attribute</a></strong><br />
+</li>
 <li class="ulchildlink"><strong><a href="rrefattrib88843.html">encryptionProvider=providerName attribute</a></strong><br />
 </li>
 <li class="ulchildlink"><strong><a href="rrefattrib60346.html">encryptionAlgorithm=algorithm attribute</a></strong><br />
@@ -123,10 +126,10 @@ an incorrect attribute or corresponding 
 </li>
 <li class="ulchildlink"><strong><a href="rrefattrib72457.html">logDevice=logDirectoryPath attribute</a></strong><br />
 </li>
-<li class="ulchildlink"><strong><a href="rrefattribnewencryptkey.html">newEncryptionKey=key attribute</a></strong><br />
-</li>
 <li class="ulchildlink"><strong><a href="rrefattribnewbootpw.html">newBootPassword=newPassword attribute</a></strong><br />
 </li>
+<li class="ulchildlink"><strong><a href="rrefattribnewencryptkey.html">newEncryptionKey=key attribute</a></strong><br />
+</li>
 <li class="ulchildlink"><strong><a href="rrefattrib42686.html">password=userPassword attribute</a></strong><br />
 </li>
 <li class="ulchildlink"><strong><a href="rrefrestorefrom.html">restoreFrom=path attribute</a></strong><br />

Modified: websites/production/db/content/derby/docs/10.8/ref/rrefattrib42100.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/ref/rrefattrib42100.html (original)
+++ websites/production/db/content/derby/docs/10.8/ref/rrefattrib42100.html Fri Dec 28 20:22:56 2012
@@ -42,7 +42,7 @@
 
 
 <div>
-<div class="section"><h2 class="sectiontitle">Function</h2><div class="p">Specifies the key to use to : <ul>
+<div class="section"><h2 class="sectiontitle">Function</h2><div class="p">Specifies the key to use to: <ul>
 <li>Encrypt a new database</li>
 
 <li>Configure an existing unencrypted database for encryption</li>
@@ -51,7 +51,11 @@
 
 </ul>
 Specify an alphanumeric string that is at least eight characters long.</div>
- </div>
+
+<p>For information about data encryption, see "Encrypting databases on disk"
+in the <cite><span><em>Derby Developer's Guide</em></span></cite>.</p>
+
+</div>
 
 <div class="section"><h2 class="sectiontitle">Combining with other attributes</h2><p>When you create
 a new database, the <em>bootPassword=key</em> attribute must be combined with
@@ -60,8 +64,7 @@ the <em><a href="rrefattrib26867.html#rr
 <p>
   When you configure an existing unencrypted database for encryption,
   the <em>bootPassword=key</em> attribute must be combined with
-  the <a href="rrefattrib15290.html#rrefattrib15290">dataEncryption=true</a>
-  attribute.
+  the <em>dataEncryption=true</em> attribute.
   For an existing, unencrypted database for which authentication and
   SQL authorization are both
   enabled, only the 
@@ -75,9 +78,13 @@ the <em><a href="rrefattrib26867.html#rr
 
 </p>
 
-<p>When
-you boot an existing encrypted database, no other attributes are necessary.</p>
- </div>
+<p>The <em>bootPassword=key</em> attribute can optionally be combined with the
+<em><a href="rrefattrib88843.html#rrefattrib88843">encryptionProvider=providerName</a></em>,
+<em><a href="rrefattrib60346.html#rrefattrib60346">encryptionAlgorithm=algorithm</a></em>,
+and/or <em><a href="rrefattribencryptkeylength.html#rrefattribencryptkeylength">encryptionKeyLength=length</a></em>
+attributes.</p>
+
+</div>
 
 <div class="example"><h2 class="sectiontitle">Examples</h2><pre><strong><span>-- create a new, encrypted database</span>
 jdbc:derby:newDB;create=true;dataEncryption=true;
@@ -86,6 +93,10 @@ jdbc:derby:newDB;create=true;dataEncrypt
 jdbc:derby:salesdb;dataEncryption=true;bootPassword=cseveryPlace
 <span>-- boot an existing encrypted database</span>
 jdbc:derby:encryptedDB;bootPassword=cseveryPlace
+<span>-- configure an existing encrypted database for encryption, 
+-- specifying the encryption algorithm</span>
+jdbc:derby:encryptedDB;dataEncryption=true;bootPassword=cseveryPlace;
+    encryptionAlgorithm=DESede/CBC/NoPadding
 </strong></pre>
 </div>
 

Modified: websites/production/db/content/derby/docs/10.8/ref/rrefattrib60346.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/ref/rrefattrib60346.html (original)
+++ websites/production/db/content/derby/docs/10.8/ref/rrefattrib60346.html Fri Dec 28 20:22:56 2012
@@ -53,11 +53,16 @@ no encryption algorithm is specified, th
 information about data encryption, see "Encrypting databases on disk" in the <cite><span><em>Derby Developer's Guide</em></span></cite>.</p>
  </div>
 
-<div class="section"><h2 class="sectiontitle">Combining with other attributes</h2> <p>The <em>encryptionAlgorithm</em> attribute
-must be combined with the <em><a href="rrefattrib42100.html#rrefattrib42100">bootPassword=key</a></em> attribute
-and the <a href="rrefattrib15290.html#rrefattrib15290">dataEncryption=true</a> attribute.
-You have the option of also specifying the <em><a href="rrefattrib88843.html#rrefattrib88843">encryptionProvider=providerName</a></em> attribute
-to specify the encryption provider of the algorithm.</p>
+<div class="section"><h2 class="sectiontitle">Combining with other attributes</h2>
+<p>The <em>encryptionAlgorithm=algorithm</em> attribute must be combined with the
+<em><a href="rrefattrib15290.html#rrefattrib15290">dataEncryption=true</a></em>
+attribute and with either the
+<em><a href="rrefattrib42100.html#rrefattrib42100">bootPassword=key</a></em>
+attribute or the 
+<em><a href="rrefattribencryptkey.html#rrefattribencryptkey">encryptionKey=key</a></em>
+attribute. You can also use the
+<em><a href="rrefattrib88843.html#rrefattrib88843">encryptionProvider=providerName</a></em>
+attribute to specify the encryption provider of the algorithm.</p>
 
 <p>
   For an existing database for which authentication and
@@ -74,13 +79,13 @@ to specify the encryption provider of th
 
 </div>
 
-<div class="example"><h2 class="sectiontitle">Examples</h2> <pre><strong><span> -- encrypt a new database</span>
-    jdbc:derby:encryptedDB;create=true;dataEncryption=true;
+<div class="example"><h2 class="sectiontitle">Examples</h2> <pre><strong><span>-- encrypt a new database</span>
+jdbc:derby:encryptedDB;create=true;dataEncryption=true;
     encryptionProvider=com.sun.crypto.provider.SunJCE;
     encryptionAlgorithm=DESede/CBC/NoPadding;
     bootPassword=cLo4u922sc23aPe
 <span>-- configure an existing database for encryption </span>
-    jdbc:derby:salesdb;dataEncryption=true; 
+jdbc:derby:salesdb;dataEncryption=true; 
     encryptionProvider=com.sun.crypto.provider.SunJCE; 
     encryptionAlgorithm=DESede/CBC/NoPadding; 
     bootPassword=cLo4u922sc23aPe 

Modified: websites/production/db/content/derby/docs/10.8/ref/rrefattrib88843.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/ref/rrefattrib88843.html (original)
+++ websites/production/db/content/derby/docs/10.8/ref/rrefattrib88843.html Fri Dec 28 20:22:56 2012
@@ -50,10 +50,18 @@ this attribute is not specified, the def
 included in the JVM that you are using.</p>
  </div>
 
-<div class="section"><h2 class="sectiontitle">Combining with other attributes</h2> <p>The <em>encryptionProvider</em> attribute
-must be combined with the <em><a href="rrefattrib42100.html#rrefattrib42100">bootPassword=key</a> and <a href="rrefattrib15290.html#rrefattrib15290">dataEncryption=true</a></em> attributes. You can
-also specify the <em><a href="rrefattrib60346.html#rrefattrib60346">encryptionAlgorithm=algorithm</a></em> attribute.</p>
- 
+<div class="section"><h2 class="sectiontitle">Combining with other attributes</h2>
+<p>The <em>encryptionProvider=providerName</em> attribute
+must be combined with the
+<em><a href="rrefattrib15290.html#rrefattrib15290">dataEncryption=true</a></em>
+attribute and with either the
+<em><a href="rrefattrib42100.html#rrefattrib42100">bootPassword=key</a></em>
+or the 
+<em><a href="rrefattribencryptkey.html#rrefattribencryptkey">encryptionKey=key</a></em>
+attribute. You can also use the
+<em><a href="rrefattrib60346.html#rrefattrib60346">encryptionAlgorithm=algorithm</a></em>
+attribute to specify the encryption algorithm.</p>
+
 <p>
   For an existing, unencrypted database for which authentication and
   SQL authorization are both
@@ -75,7 +83,7 @@ jdbc:derby:encryptedDB;create=true;dataE
     encryptionAlgorithm=DESede/CBC/NoPadding;
     bootPassword=cLo4u922sc23aPe
 <span>-- configure an existing database for encryption </span>
-    jdbc:derby:salesdb;dataEncryption=true; 
+jdbc:derby:salesdb;dataEncryption=true; 
     encryptionProvider=com.sun.crypto.provider.SunJCE; 
     encryptionAlgorithm=DESede/CBC/NoPadding; 
     bootPassword=cLo4u922sc23aPe 

Modified: websites/production/db/content/derby/docs/10.8/ref/rrefattribencryptkey.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/ref/rrefattribencryptkey.html (original)
+++ websites/production/db/content/derby/docs/10.8/ref/rrefattribencryptkey.html Fri Dec 28 20:22:56 2012
@@ -51,12 +51,20 @@
 
 </ul>
 Your application must provide the encryption key.</div>
+
+<p>For information about data encryption, see "Encrypting databases on disk"
+in the <cite><span><em>Derby Developer's Guide</em></span></cite>.</p>
+
 </div>
 
 <div class="section"><h2 class="sectiontitle">Combining with other attributes</h2><p>When creating a
-new database, you must combine the <em>encryptionKey</em> attribute with the <em>create=true</em> and <em>dataEncryption=true</em> attributes. </p>
+new database, you must combine the <em>encryptionKey=key</em> attribute with the
+<em><a href="rrefattrib26867.html#rrefattrib26867">create=true</a></em> and
+<em><a href="rrefattrib15290.html#rrefattrib15290">dataEncryption=true</a></em>
+attributes. </p>
 <p>When
-you configure an existing unencrypted database for encryption, the <em>encryptionKey</em> attribute
+you configure an existing unencrypted database for encryption, the
+<em>encryptionKey=key</em> attribute
 must be combined with the <em>dataEncryption=true</em> attribute.
 For an existing, unencrypted database for which authentication
 and SQL authorization are both
@@ -69,23 +77,25 @@ in the 
 <span><em>Derby Developer's Guide</em></span>
 for more information.
 </p>
-<p>When
-booting an existing encrypted database, you must also specify the <em>encryptionAlgorithm</em> attribute
-if the algorithm that was used when the database was created is not the default
-algorithm. </p>
-<p>The default encryption algorithm used by <span>Derby</span> is
-DES/CBC/NoPadding.</p>
- </div>
+
+<p>The <em>encryptionKey=key</em> attribute can optionally be combined with the
+<em><a href="rrefattrib88843.html#rrefattrib88843">encryptionProvider=providerName</a></em>,
+<em><a href="rrefattrib60346.html#rrefattrib60346">encryptionAlgorithm=algorithm</a></em>,
+and/or <em><a href="rrefattribencryptkeylength.html#rrefattribencryptkeylength">encryptionKeyLength=length</a></em>
+attributes.</p>
+</div>
 
 <div class="example"><h2 class="sectiontitle">Examples</h2><p><strong>Example of a JDBC URL that creates a
 new encrypted database:</strong></p>
 <pre>jdbc:derby:newDB;create=true;dataEncryption=true;
-   encryptionAlgorithm=DES/CBC/NoPadding;encryptionKey=6162636465666768</pre>
+   encryptionKey=6162636465666768</pre>
 <div class="p"><strong>Example
-of a JDBC URL that configures an existing unencrypted database for encryption:</strong><pre>jdbc:derby:salesdb;dataEncryption=true;encryptionKey=6162636465666768
+of a JDBC URL that configures an existing unencrypted database for encryption:</strong>
+<pre>jdbc:derby:salesdb;dataEncryption=true;encryptionKey=6162636465666768
 </pre>
 </div>
-<div class="p"><strong>Example of a JDBC URL that boots an encrypted database:</strong><pre>jdbc:derby:encryptedDB;encryptionKey=6162636465666768</pre>
+<div class="p"><strong>Example of a JDBC URL that boots an encrypted database:</strong>
+<pre>jdbc:derby:encryptedDB;encryptionKey=6162636465666768</pre>
 </div>
  </div>
 

Modified: websites/production/db/content/derby/docs/10.8/ref/rrefattribnewbootpw.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/ref/rrefattribnewbootpw.html (original)
+++ websites/production/db/content/derby/docs/10.8/ref/rrefattribnewbootpw.html Fri Dec 28 20:22:56 2012
@@ -50,11 +50,13 @@ about this attribute, see "Encrypting da
 in the <cite><span><em>Derby Developer's Guide</em></span></cite>.</p>
  </div>
 
-<div class="section"><h2 class="sectiontitle">Combining with other attributes</h2><p>The <em>newBootPassword</em> attribute
-must be combined with the <em><a href="rrefattrib42100.html#rrefattrib42100">bootPassword=key</a></em> attribute.</p>
-<p>You
-cannot change the encryption provider or the encryption algorithm when you
-use the <em>newBootPassword</em> attribute.</p>
+<div class="section"><h2 class="sectiontitle">Combining with other attributes</h2>
+<p>The <em>newBootPassword=newPassword</em> attribute must be combined with the
+<em><a href="rrefattrib42100.html#rrefattrib42100">bootPassword=key</a></em>
+attribute.</p>
+
+<p>You cannot change the encryption provider or the encryption algorithm when
+you use the <em>newBootPassword=newPassword</em> attribute.</p>
 
 <p>
   For an existing encrypted database for which authentication and

Modified: websites/production/db/content/derby/docs/10.8/ref/rrefattribnewencryptkey.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/ref/rrefattribnewencryptkey.html (original)
+++ websites/production/db/content/derby/docs/10.8/ref/rrefattribnewencryptkey.html Fri Dec 28 20:22:56 2012
@@ -49,11 +49,13 @@ use this key for encryption. For more in
 "Encrypting databases with a new external encryption key" in the <cite><span><em>Derby Developer's Guide</em></span></cite>.</p>
  </div>
 
-<div class="section"><h2 class="sectiontitle">Combining with other attributes</h2> <p>The <em>newEncryptionKey</em> attribute
-must be combined with the <em><a href="rrefattribencryptkey.html#rrefattribencryptkey">encryptionKey=key</a></em> attribute.</p>
-<p>You
-cannot change the encryption provider or the encryption algorithm when you
-use the <em>newEncryptionKey</em> attribute.</p>
+<div class="section"><h2 class="sectiontitle">Combining with other attributes</h2> 
+<p>The <em>newEncryptionKey=key</em> attribute must be combined with the
+<em><a href="rrefattribencryptkey.html#rrefattribencryptkey">encryptionKey=key</a></em>
+attribute.</p>
+
+<p>You cannot change the encryption provider or the encryption algorithm when
+you use the <em>newEncryptionKey=key</em> attribute.</p>
  
 <p>
   For an existing encrypted database for which authentication and
@@ -71,7 +73,8 @@ use the <em>newEncryptionKey</em> attrib
 </div>
 
 <div class="example"><h2 class="sectiontitle">Example</h2><pre><strong><span>-- specify a new encryption key for a database</span>
-jdbc:derby:salesdb;encryptionKey=6162636465666768;newEncryptionKey=6862636465666768</strong></pre>
+jdbc:derby:salesdb;encryptionKey=6162636465666768;
+    newEncryptionKey=6862636465666768</strong></pre>
  </div>
 
 </div>

Modified: websites/production/db/content/derby/docs/10.8/ref/rrefbuiltchar.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/ref/rrefbuiltchar.html (original)
+++ websites/production/db/content/derby/docs/10.8/ref/rrefbuiltchar.html Fri Dec 28 20:22:56 2012
@@ -167,7 +167,7 @@ to make the change.</dd>
 <div class="p">Use the CHAR function to return the values for EDLEVEL (defined
 as smallint) as a fixed length character string: <pre><strong>SELECT CHAR</strong>(EDLEVEL) <strong>FROM</strong> EMPLOYEE</pre>
 An
-EDLEVEL of 18 would be returned as the CHAR(6) value '18????????' (18 followed by
+EDLEVEL of 18 would be returned as the CHAR(6) value '18    ' (18 followed by
 four blanks).</div>
  </div>
 

Modified: websites/production/db/content/derby/docs/10.8/ref/rrefexcept71493.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/ref/rrefexcept71493.html (original)
+++ websites/production/db/content/derby/docs/10.8/ref/rrefexcept71493.html Fri Dec 28 20:22:56 2012
@@ -1409,7 +1409,7 @@
                         </tr>
 
                         <tr>
-                            <td valign="top" width="11.76470588235294%" headers="N1127D">40XL2</td>
+                            <td valign="top" width="11.76470588235294%" headers="N1127D">40XL1</td>
 
                             <td valign="top" width="88.23529411764706%" headers="N11284">A lock could not be obtained within the time requested.  The lockTable dump is: <var class="varname">&lt;tableDump&gt;</var></td>
 

Modified: websites/production/db/content/derby/docs/10.8/ref/rrefjdbc27734.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/ref/rrefjdbc27734.html (original)
+++ websites/production/db/content/derby/docs/10.8/ref/rrefjdbc27734.html Fri Dec 28 20:22:56 2012
@@ -62,19 +62,41 @@
 
 
 <div>
-<div class="section"><p>A <span>Derby</span>??<em>Connection</em> object
+<div class="section"><p>A <span>Derby</span> <em>Connection</em> object
 is not garbage-collected until all other JDBC objects created from that connection
-are explicitly closed or are themselves garbage-collected. Once the connection
+are closed or are themselves garbage-collected. Once the connection
 is closed, no further JDBC requests can be made against objects created from
 the connection. Do not explicitly close the <em>Connection</em> object until
 you no longer need it for executing statements.</p>
 </div>
 
-<div class="section"><p>A session-severity or higher exception causes the connection to
-close and all other JDBC objects against it to be closed. System-severity
-exceptions cause the <span>Derby</span> system
-to shut down, which not only closes the connection but means that no new connections
-should be created in the current JVM.</p>
+<div class="section">
+<p>The <em>Connection</em> interface extends <em>AutoCloseable</em> in JDK 7 and
+after. If you declare a connection in a <em>try</em>-with-resources statement and
+there is an error that the code does not catch, the JRE will attempt to close
+the connection automatically.</p>
+
+<p>Note that a transaction-severity or higher exception causes
+<span>Derby</span> to abort an in-flight
+transaction. But a statement-severity exception does NOT roll back the
+transaction. Also note that
+<span>Derby</span> throws an exception if
+an attempt is made to close a connection with an in-flight transaction. Suppose
+now that a <em>Connection</em> is declared in a <em>try</em>-with-resources
+statement, a transaction is in-flight, and an unhandled statement-severity error
+occurs inside the <em>try</em>-with-resources block. In this situation,
+<span>Derby</span> will raise a follow-on
+exception as the JRE exits the <em>try</em>-with-resources block. (For details on
+error severity levels, see
+<em><a href="rrefproper26985.html#rrefproper26985">derby.stream.error.logSeverityLevel</a></em>.)</p>
+
+<p>It is therefore always best to catch errors inside the
+<em>try</em>-with-resources block and to either roll back or commit, as
+appropriate, to ensure that there is no pending transaction when leaving the
+<em>try</em>-with-resources block. This action also improves application
+portability, since DBMSs differ in their semantics when trying to close a
+connection with a pending transaction.</p>
+
 </div>
 
 <div class="section">
@@ -88,11 +110,11 @@ specific to <span>Derby</span>.</p>
 
 <thead align="left">
 <tr valign="bottom">
-<th valign="bottom" width="30%" id="N100C5">Returns</th>
+<th valign="bottom" width="30%" id="N10121">Returns</th>
 
-<th valign="bottom" width="40%" id="N100CC">Signature</th>
+<th valign="bottom" width="40%" id="N10128">Signature</th>
 
-<th valign="bottom" width="30%" id="N100D3">Implementation Notes</th>
+<th valign="bottom" width="30%" id="N1012F">Implementation Notes</th>
 
 </tr>
 
@@ -100,22 +122,22 @@ specific to <span>Derby</span>.</p>
 
 <tbody>
 <tr>
-<td valign="top" width="30%" headers="N100C5"><em>PreparedStatement</em></td>
+<td valign="top" width="30%" headers="N10121"><em>PreparedStatement</em></td>
 
-<td valign="top" width="40%" headers="N100CC"><em>prepareStatement(String sql, int [] columnIndexes)</em></td>
+<td valign="top" width="40%" headers="N10128"><em>prepareStatement(String sql, int [] columnIndexes)</em></td>
 
-<td valign="top" width="30%" headers="N100D3">Every column index in the array must correlate to an 
+<td valign="top" width="30%" headers="N1012F">Every column index in the array must correlate to an 
 <a href="rrefsqlj37836.html#rrefsqlj37836">auto-increment</a>
 column within the target table of the INSERT. Supported in embedded mode only.</td>
 
 </tr>
 
 <tr>
-<td valign="top" width="30%" headers="N100C5"><em>PreparedStatement</em></td>
+<td valign="top" width="30%" headers="N10121"><em>PreparedStatement</em></td>
 
-<td valign="top" width="40%" headers="N100CC"><em>prepareStatement(String sql, String [] columnNames)</em></td>
+<td valign="top" width="40%" headers="N10128"><em>prepareStatement(String sql, String [] columnNames)</em></td>
 
-<td valign="top" width="30%" headers="N100D3">Every column name in the array must designate an 
+<td valign="top" width="30%" headers="N1012F">Every column name in the array must designate an 
 <a href="rrefsqlj37836.html#rrefsqlj37836">auto-increment</a>
 column within the target table of the INSERT. Supported in embedded mode only.</td>
 

Modified: websites/production/db/content/derby/docs/10.8/ref/rrefproper40688.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/ref/rrefproper40688.html (original)
+++ websites/production/db/content/derby/docs/10.8/ref/rrefproper40688.html Fri Dec 28 20:22:56 2012
@@ -102,14 +102,18 @@ lifetime of the newly created conglomera
 
 <div class="section"><h2 class="sectiontitle">Default</h2>
 <p><span>Derby</span> automatically tunes
-for the database page size. If you have long columns, the default page size for
-the table is set to 32768 bytes. Otherwise, the default is 4096 bytes.</p>
+for the database page size. If you have any LONG VARCHAR, LONG VARCHAR FOR BIT
+DATA, BLOB, or CLOB columns, or if
+<span>Derby</span> estimates that the
+total length of the columns declared at create time is greater than 4096 bytes,
+the default page size for the table is set to 32768 bytes. Otherwise, the
+default is 4096 bytes.</p>
 
 </div>
 
 <div class="section"><h2 class="sectiontitle">Valid values</h2>
-<p>Page size can only be one the following values: 4096, 8192, 16384, or 32768
-bytes. If you specify an invalid value,
+<p>Page size can only be one of the following values: 4096, 8192, 16384, or
+32768 bytes. If you specify an invalid value,
 <span>Derby</span> uses the default
 value.</p>
 

Modified: websites/production/db/content/derby/docs/10.8/ref/rrefsqlj1083019.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/ref/rrefsqlj1083019.html (original)
+++ websites/production/db/content/derby/docs/10.8/ref/rrefsqlj1083019.html Fri Dec 28 20:22:56 2012
@@ -143,7 +143,7 @@ target table.   <pre><strong>UPDATE t2 S
 <li>Dynamic parameters are allowed as the operand of the unary operators -
 or +. For example:<pre><strong>CREATE TABLE t1 (c11 INT, c12 SMALLINT, c13 DOUBLE, c14 CHAR(3))
 SELECT * FROM t1 WHERE c11 BETWEEN -? AND +?
-<span>-??? The type of both of the unary operators is INT
+<span>-– The type of both of the unary operators is INT
 -- based on the context in which they are used (that is,
 -- because c11 is INT, the unary parameters also get the 
 -- type INT.</span></strong></pre>

Modified: websites/production/db/content/derby/docs/10.8/ref/toc.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/ref/toc.html (original)
+++ websites/production/db/content/derby/docs/10.8/ref/toc.html Fri Dec 28 20:22:56 2012
@@ -501,12 +501,13 @@
 <li><a href="rrefattribderegister.html">deregister=false attribute</a></li>
 <li><a href="rrefattribdrop.html">drop=true attribute</a></li>
 <li><a href="rrefattribencryptkey.html">encryptionKey=key attribute</a></li>
+<li><a href="rrefattribencryptkeylength.html">encryptionKeyLength=length attribute</a></li>
 <li><a href="rrefattrib88843.html">encryptionProvider=providerName attribute</a></li>
 <li><a href="rrefattrib60346.html">encryptionAlgorithm=algorithm attribute</a></li>
 <li><a href="rrefattribfailover.html">failover=true attribute</a></li>
 <li><a href="rrefattrib72457.html">logDevice=logDirectoryPath attribute</a></li>
-<li><a href="rrefattribnewencryptkey.html">newEncryptionKey=key attribute</a></li>
 <li><a href="rrefattribnewbootpw.html">newBootPassword=newPassword attribute</a></li>
+<li><a href="rrefattribnewencryptkey.html">newEncryptionKey=key attribute</a></li>
 <li><a href="rrefattrib42686.html">password=userPassword attribute</a></li>
 <li><a href="rrefrestorefrom.html">restoreFrom=path attribute</a></li>
 <li><a href="rrefattribretrievemsgtext.html">retrieveMessageText=false attribute</a></li>

Modified: websites/production/db/content/derby/docs/10.8/tools/derbytools.pdf
==============================================================================
Binary files - no diff available.

Modified: websites/production/db/content/derby/docs/10.8/tools/rtoolsijcomref16653.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/tools/rtoolsijcomref16653.html (original)
+++ websites/production/db/content/derby/docs/10.8/tools/rtoolsijcomref16653.html Fri Dec 28 20:22:56 2012
@@ -90,7 +90,7 @@ the first new line encountered in the te
  <p>Comments are ignored on
 input and have no effect on the output displayed.</p>
  
-<p>You can also enclose text in <samp class="codeph">/*??*/</samp> characters to create 
+<p>You can also enclose text in <samp class="codeph">/* */</samp> characters to create 
 either one-line or multi-line comments. Nested comments are permitted. 
 For example, you could put lines like the following into a script named
 <samp class="codeph">comment.sql</samp>:

Modified: websites/production/db/content/derby/docs/10.8/tools/rtoolsijcomref30679.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/tools/rtoolsijcomref30679.html (original)
+++ websites/production/db/content/derby/docs/10.8/tools/rtoolsijcomref30679.html Fri Dec 28 20:22:56 2012
@@ -90,7 +90,7 @@ by <samp class="codeph">ij</samp>. <em>N
 with the Execute command</em>.</li>
 
 <li>To execute a named command identified by <em>PreparedStatementIdentifier</em>.
-This must be previously prepared with the <samp class="codeph">ij</samp>??<a href="rtoolsijcomref12333.html#rtoolsijcomref12333">Prepare</a> command.</li>
+This must be previously prepared with the <samp class="codeph">ij</samp> <a href="rtoolsijcomref12333.html#rtoolsijcomref12333">Prepare</a> command.</li>
 
 <li>To execute either flavor of command when that command contains dynamic
 parameters, specify the values in the Using portion of the command. In this

Modified: websites/production/db/content/derby/docs/10.8/tools/rtoolsijcomref36618.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/tools/rtoolsijcomref36618.html (original)
+++ websites/production/db/content/derby/docs/10.8/tools/rtoolsijcomref36618.html Fri Dec 28 20:22:56 2012
@@ -100,7 +100,7 @@ the statement, no cursor is created.</p>
 by the underlying database. <span>Derby</span> does not allow multiple open cursors
 with the same name.</p>
 
-<p>Once a cursor has been created, the <samp class="codeph">ij</samp>??<a href="rtoolsijcomref11128.html#rtoolsijcomref11128">Next</a> and <a href="rtoolsijcomref24423.html#rtoolsijcomref24423">Close</a> commands can
+<p>Once a cursor has been created, the <samp class="codeph">ij</samp> <a href="rtoolsijcomref11128.html#rtoolsijcomref11128">Next</a> and <a href="rtoolsijcomref24423.html#rtoolsijcomref24423">Close</a> commands can
 be used to step through its rows, and if the connection supports positioned
 update and delete commands, they can be issued to alter the rows.</p>
 

Modified: websites/production/db/content/derby/docs/10.8/tools/rtoolsijcomref37862.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/tools/rtoolsijcomref37862.html (original)
+++ websites/production/db/content/derby/docs/10.8/tools/rtoolsijcomref37862.html Fri Dec 28 20:22:56 2012
@@ -79,7 +79,7 @@
 
 <div>
 <div class="section"><h2 class="sectiontitle">Syntax</h2>
-<pre><strong>ASYNC <strong><em><a href="rtoolsijcomref40155.html#rtoolsijcomref40155">Identifier</a>??<a href="rtoolsijcomref34110.html#rtoolsijcomref34110">String</a></em></strong></strong></pre>
+<pre><strong>ASYNC <strong><em><a href="rtoolsijcomref40155.html#rtoolsijcomref40155">Identifier</a> <a href="rtoolsijcomref34110.html#rtoolsijcomref34110">String</a></em></strong></strong></pre>
 
 </div>
 
@@ -96,7 +96,7 @@ identifier for an async statement on the
 specifies a <em>connectionName</em> must not be the same as any other identifier
 for an async statement on the designated connection. You cannot reference a
 statement previously prepared and named by the
-<samp class="codeph">ij</samp>??<a href="rtoolsijcomref12333.html#rtoolsijcomref12333">Prepare</a>
+<samp class="codeph">ij</samp> <a href="rtoolsijcomref12333.html#rtoolsijcomref12333">Prepare</a>
 command in this command.</p>
 
 <p><samp class="codeph">ij</samp> creates a new thread in the current or designated connection to issue the

Modified: websites/production/db/content/derby/docs/10.8/tuning/ctunoptimzoverride.html
==============================================================================
--- websites/production/db/content/derby/docs/10.8/tuning/ctunoptimzoverride.html (original)
+++ websites/production/db/content/derby/docs/10.8/tuning/ctunoptimzoverride.html Fri Dec 28 20:22:56 2012
@@ -91,7 +91,7 @@ cannot be specified on views or derived 
 
 <dt class="dlterm" id="ctunoptimzoverride__joinorder"><a name="ctunoptimzoverride__joinorder"><!-- --></a>joinOrder</dt>
 
-<dd>Use the joinOrder property to override the optimizer???s choice of join
+<dd>Use the joinOrder property to override the optimizer’s choice of join
 order for two tables. When the value FIXED is specified, the optimizer will
 choose the order of tables as they appear in the FROM clause as the join order.
  Valid values for the joinOrder property include FIXED and UNFIXED. The joinOrder
@@ -100,7 +100,7 @@ property can be used with a FROM clause.
 
 <dt class="dlterm" id="ctunoptimzoverride__joinstrat"><a name="ctunoptimzoverride__joinstrat"><!-- --></a>joinStrategy</dt>
 
-<dd>Use the joinStrategy property to override the optimizer???s choice of join
+<dd>Use the joinStrategy property to override the optimizer’s choice of join
 strategy. The two types of join strategy are called <em>nested loop</em> and <em>hash</em>.
 In a nested loop join strategy, for each qualifying row in the outer table,
 Derby uses the appropriate access path (index or table scan) to find the matching

Modified: websites/production/db/content/derby/docs/10.8/tuning/tuningderby.pdf
==============================================================================
Binary files - no diff available.



Mime
View raw message