db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1029681 - in /db/derby/docs/trunk/src/ref: refderby.ditamap rrefjdbc1020262.dita rrefjdbc12124.dita rrefjdbc27768.dita rrefjdbc41784.dita rrefjdbcescapedate.dita
Date Mon, 01 Nov 2010 14:32:14 GMT
Author: chaase3
Date: Mon Nov  1 14:32:14 2010
New Revision: 1029681

URL: http://svn.apache.org/viewvc?rev=1029681&view=rev
Log:
DERBY-4870: Reference Manual map file issues with out-of-order/duplicate topics

Corrected map file; removed duplicate topic and corrected related ones.

Patches: DERBY-4870.diff

Removed:
    db/derby/docs/trunk/src/ref/rrefjdbc27768.dita
Modified:
    db/derby/docs/trunk/src/ref/refderby.ditamap
    db/derby/docs/trunk/src/ref/rrefjdbc1020262.dita
    db/derby/docs/trunk/src/ref/rrefjdbc12124.dita
    db/derby/docs/trunk/src/ref/rrefjdbc41784.dita
    db/derby/docs/trunk/src/ref/rrefjdbcescapedate.dita

Modified: db/derby/docs/trunk/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/refderby.ditamap?rev=1029681&r1=1029680&r2=1029681&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/refderby.ditamap (original)
+++ db/derby/docs/trunk/src/ref/refderby.ditamap Mon Nov  1 14:32:14 2010
@@ -207,13 +207,13 @@ limitations under the License.
 </topicref>
 </topicref>
 <topicref href="rrefsqljrevoke.dita" navtitle="REVOKE statement"></topicref>
+<topicref href="rrefsqlj41360.dita" navtitle="SELECT statement"></topicref>
 <topicref collection-type="family" href="crefsqlj35312.dita" navtitle="SET statements">
 <topicref href="rrefsqlj41180.dita" navtitle="SET CURRENT ISOLATION statement">
 </topicref>
 <topicref href="rrefsetrole.dita" navtitle="SET ROLE statement"></topicref>
 <topicref href="rrefsqlj32268.dita" navtitle="SET SCHEMA statement"></topicref>
 </topicref>
-<topicref href="rrefsqlj41360.dita" navtitle="SELECT statement"></topicref>
 <topicref href="rrefsqljtruncatetable.dita" navtitle="TRUNCATE TABLE statement"></topicref>
 <topicref href="rrefsqlj26498.dita" navtitle="UPDATE statement"></topicref>
 </topicref>
@@ -610,7 +610,6 @@ URL syntax"></topicref>
 <topicref collection-type="family" href="rrefjdbc1020262.dita" navtitle="JDBC escape syntax
">
 <topicref href="rrefjdbc70824.dita" navtitle="JDBC escape keyword for call statements">
 </topicref>
-<topicref href="rrefjdbc27768.dita" navtitle="JDBC escape syntax"></topicref>
 <topicref href="rrefjdbc28456.dita" navtitle="JDBC escape syntax for LIKE clauses">
 </topicref>
 <topicref href="rrefjdbc88908.dita" navtitle="JDBC escape syntax for fn keyword">
@@ -667,6 +666,7 @@ URL syntax"></topicref>
 </topicref>
 <topicref href="rrefattribslaveport.dita" navtitle="slavePort=portValue attribute">
 </topicref>
+<topicref href="rrefattribssl.dita" navtitle="ssl=sslMode attribute"></topicref>
 <topicref href="rrefattribstartmaster.dita" navtitle="startMaster=true attribute">
 </topicref>
 <topicref href="rrefattribstartslave.dita" navtitle="startSlave=true attribute">
@@ -689,7 +689,6 @@ URL syntax"></topicref>
 </topicref>
 <topicref href="rrefattrib10035.dita" navtitle="user=userName attribute">
 </topicref>
-<topicref href="rrefattribssl.dita" navtitle="ssl=sslMode attribute"></topicref>
 <topicref href="rrefattrib34183.dita" navtitle="Creating a connection without specifying
attributes">
 </topicref>
 </topicref>

Modified: db/derby/docs/trunk/src/ref/rrefjdbc1020262.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc1020262.dita?rev=1029681&r1=1029680&r2=1029681&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc1020262.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc1020262.dita Mon Nov  1 14:32:14 2010
@@ -37,8 +37,6 @@ always follows the opening curly brace:<
 the following JDBC escape keywords, which are case-insensitive:   <ul>
 <li><i><xref href="rrefjdbc70824.dita#rrefjdbc70824"></xref></i>
  <p>The escape keyword
 for use in <i>CallableStatements</i>.</p></li>
-<li><i><xref href="rrefjdbc27768.dita#rrefjdbc27768"></xref></i>
  <p>The escape keyword
-for date formats.</p></li>
 <li><i><xref href="rrefjdbc28456.dita#rrefjdbc28456"></xref></i>
  <p>The keyword
 for specifying escape characters for LIKE clauses.</p></li>
 <li><i><xref href="rrefjdbc88908.dita#rrefjdbc88908"></xref></i>
  <p>The escape keyword
@@ -47,6 +45,8 @@ for scalar functions.</p></li>
 for outer joins.</p></li>
 <li><i><xref href="rrefjdbc12124.dita#rrefjdbc12124"></xref></i>
  <p>The escape keyword
 for time formats.</p></li>
+<li><i><xref href="rrefjdbcescapedate.dita#rrefjdbcescapedate"></xref></i>
  <p>The escape keyword
+for date formats.</p></li>
 <li><i><xref href="rrefjdbc41784.dita#rrefjdbc41784"></xref></i>
  <p>The escape keyword
 for timestamp formats.</p></li>
 </ul></p></section>

Modified: db/derby/docs/trunk/src/ref/rrefjdbc12124.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc12124.dita?rev=1029681&r1=1029680&r2=1029681&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc12124.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc12124.dita Mon Nov  1 14:32:14 2010
@@ -30,7 +30,7 @@ the JDBC escape syntax for time as equiv
 times. <ph conref="../conrefs.dita#prod/productshortname"></ph> also supports
 the ISO format of 8 characters (6 digits, and 2 decimal points).</p></section>
 <refsyn><title>Syntax</title><codeblock><b>{t 'hh:mm:ss'}</b></codeblock>
</refsyn>
-<section><title>Equivalent to</title><codeblock><b>TIME 'hh:mm:ss'</b></codeblock>
</section>
+<section><title>Equivalent to</title><codeblock><b>TIME('hh:mm:ss')</b></codeblock>
</section>
 <example> <title>Example</title><codeblock><b>VALUES {t '20:00:03'}</b></codeblock>
</example>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/ref/rrefjdbc41784.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc41784.dita?rev=1029681&r1=1029680&r2=1029681&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc41784.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc41784.dita Mon Nov  1 14:32:14 2010
@@ -32,7 +32,7 @@ for timestamps. <ph conref="../conrefs.d
 supports the ISO format of 23 characters (17 digits, 3 dashes, and 3 decimal
 points).</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>{ts 'yyyy-mm-dd
hh:mm:ss.f...'}</b></codeblock> </refsyn>
-<section><title>Equivalent to</title> <codeblock><b>TIMESTAMP
'yyyy-mm-dd hh:mm:ss.f...'</b></codeblock> <p>The
+<section><title>Equivalent to</title> <codeblock><b>TIMESTAMP('yyyy-mm-dd
hh:mm:ss.f...')</b></codeblock> <p>The
 fractional portion of timestamp constants (.f...) can be omitted.</p> </section>
 <example><title>Example</title>
 <codeblock id="i1020504"><b>VALUES {ts '1999-01-09 20:11:11.123455'}</b></codeblock>
</example>

Modified: db/derby/docs/trunk/src/ref/rrefjdbcescapedate.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbcescapedate.dita?rev=1029681&r1=1029680&r2=1029681&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbcescapedate.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbcescapedate.dita Mon Nov  1 14:32:14 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "reference.dtd">
+ "../dtd/reference.dtd">
 <!-- 
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -20,16 +20,18 @@ limitations under the License.
 <reference id="rrefjdbcescapedate" xml:lang="en-us">
 <title>JDBC escape syntax for date formats</title>
 <prolog><metadata>
-<keywords><indexterm>d (JDBC escape keyword)</indexterm><indexterm>{d
(JDBC
-escape syntax)</indexterm><indexterm>JDBC escape syntax for</indexterm><indexterm>Date
-formats</indexterm></keywords>
+<keywords><indexterm>Date formats<indexterm>JDBC escape syntax for</indexterm></indexterm>
+<indexterm>d (JDBC escape keyword)</indexterm><indexterm>{d (JDBC escape
syntax)</indexterm>
+</keywords>
 </metadata></prolog>
 <refbody>
 <section> <p><ph conref="../conrefs.dita#prod/productshortname"></ph>
interprets
 the JDBC escape syntax for dates as equivalent to the correct SQL syntax for
 dates.</p></section>
 <refsyn><title>Syntax</title><codeblock><b>{d 'yyyy-mm-dd'}</b></codeblock>
</refsyn>
-<section><title>Equivalent to</title><codeblock><b>DATE 'yyyy-mm-dd'</b></codeblock>
</section>
-<example> <title>Example</title><codeblock><b>VALUES {d '1995-12-19'}</b></codeblock>
</example>
+<section><title>Equivalent to</title>
+<codeblock><b>DATE('yyyy-mm-dd')</b></codeblock> </section>
+<example><title>Example</title>
+<codeblock><b>VALUES {d '2010-10-19'}</b></codeblock> </example>
 </refbody>
 </reference>



Mime
View raw message