svn commit: r1097973 - in /db/derby/docs/trunk/src/ref: rrefattrib16471.dita rrefattribdrop.dita

[ch...@apache.org]

Author: chaase3
Date: Fri Apr 29 22:18:48 2011
New Revision: 1097973

URL: http://svn.apache.org/viewvc?rev=1097973&view=rev
Log:
DERBY-5203 Documentation of drop=true attribute contains error

Modifications to two Reference Manual topics (drop=true and shutdown=true).

Patches: DERBY-5203-3.diff

Modified:
    db/derby/docs/trunk/src/ref/rrefattrib16471.dita
    db/derby/docs/trunk/src/ref/rrefattribdrop.dita

Modified: db/derby/docs/trunk/src/ref/rrefattrib16471.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattrib16471.dita?rev=1097973&r1=1097972&r2=1097973&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattrib16471.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattrib16471.dita Fri Apr 29 22:18:48 2011
@@ -58,6 +58,13 @@ the <i>DriverManager</i> with a <i>shutd
 <p>This attribute may be combined with the  
 <i><xref href="rrefattribderegister.dita#rrefattribderegister">deregister=true</xref></i>
 attribute.</p>
+<p>If authentication or authorization is turned on, you must specify this
+attribute in conjunction with the <i><xref
+href="rrefattrib10035.dita#rrefattrib10035">user=userName</xref></i> and
+<i><xref
+href="rrefattrib42686.dita#rrefattrib42686">password=userPassword</xref></i>
+attributes. If authorization is turned on, the user must be the database owner.
+</p>
 </section>
 <example><title>Examples</title>
 <codeblock><b><ph>-- shut down entire system</ph>

Modified: db/derby/docs/trunk/src/ref/rrefattribdrop.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattribdrop.dita?rev=1097973&r1=1097972&r2=1097973&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattribdrop.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattribdrop.dita Fri Apr 29 22:18:48 2011
@@ -42,9 +42,13 @@ database, <ph conref="../conrefs.dita#pr
 <i>SQLException</i> XBM0I.</p>
 </section>
 <section><title>Combining with other attributes</title>
-<p>This attribute, like
-<i><xref href="rrefattrib16471.dita#rrefattrib16471">shutdown=true</xref></i>,
-cannot be combined with other attributes.</p>
+<p>If authentication or authorization is turned on, you must specify this
+attribute in conjunction with the <i><xref
+href="rrefattrib10035.dita#rrefattrib10035">user=userName</xref></i> and
+<i><xref
+href="rrefattrib42686.dita#rrefattrib42686">password=userPassword</xref></i>
+attributes. If authorization is turned on, the user must be the database owner.
+</p>
 </section>
 <example><title>Examples</title>
 <codeblock><b><ph>-- drop an in-memory database using the embedded driver</ph>