svn commit: r1099093 - in /db/derby/docs/branches/10.8/src/ref: rrefattrib16471.dita rrefattribdrop.dita rrefattribstartmaster.dita rrefattribstartslave.dita rrefattribstopmaster.dita

[ch...@apache.org]

Author: chaase3
Date: Tue May  3 15:36:08 2011
New Revision: 1099093

URL: http://svn.apache.org/viewvc?rev=1099093&view=rev
Log:
DERBY-5212  Reference Manual: language on authentication/authorization needs changes for several URL attribute topics

Merged DERBY-5212.diff to 10.8 code branch from trunk revision 1099086.

Modified:
    db/derby/docs/branches/10.8/src/ref/rrefattrib16471.dita
    db/derby/docs/branches/10.8/src/ref/rrefattribdrop.dita
    db/derby/docs/branches/10.8/src/ref/rrefattribstartmaster.dita
    db/derby/docs/branches/10.8/src/ref/rrefattribstartslave.dita
    db/derby/docs/branches/10.8/src/ref/rrefattribstopmaster.dita

Modified: db/derby/docs/branches/10.8/src/ref/rrefattrib16471.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/ref/rrefattrib16471.dita?rev=1099093&r1=1099092&r2=1099093&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/ref/rrefattrib16471.dita (original)
+++ db/derby/docs/branches/10.8/src/ref/rrefattrib16471.dita Tue May  3 15:36:08 2011
@@ -58,13 +58,21 @@ 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
+<p>When you shut down a database, if authentication 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 both authentication and SQL authorization are turned on, the user
+must be the database owner.</p>
+<p>When you shut down the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> system, if both
+authentication and SQL authorization are 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>
+attributes.</p>
 </section>
 <example><title>Examples</title>
 <codeblock><b><ph>-- shut down entire system</ph>

Modified: db/derby/docs/branches/10.8/src/ref/rrefattribdrop.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/ref/rrefattribdrop.dita?rev=1099093&r1=1099092&r2=1099093&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/ref/rrefattribdrop.dita (original)
+++ db/derby/docs/branches/10.8/src/ref/rrefattribdrop.dita Tue May  3 15:36:08 2011
@@ -42,13 +42,13 @@ database, <ph conref="../conrefs.dita#pr
 <i>SQLException</i> XBM0I.</p>
 </section>
 <section><title>Combining with other attributes</title>
-<p>If authentication or authorization is turned on, you must specify this
-attribute in conjunction with the <i><xref
+<p>If authentication 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>
+attributes. If both authentication and SQL authorization are 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>

Modified: db/derby/docs/branches/10.8/src/ref/rrefattribstartmaster.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/ref/rrefattribstartmaster.dita?rev=1099093&r1=1099092&r2=1099093&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/ref/rrefattribstartmaster.dita (original)
+++ db/derby/docs/branches/10.8/src/ref/rrefattribstartmaster.dita Tue May  3 15:36:08 2011
@@ -56,13 +56,13 @@ attribute. You may also specify this att
 href="rrefattribslaveport.dita#rrefattribslaveport">slavePort=portValue</xref></i>
 attribute. If you do not specify the <i>slavePort=portValue</i> attribute, the
 default port value is 4851.</p>
-<p>If authentication or authorization is turned on, you
-must also specify this attribute in conjunction with the <i><xref
+<p>If authentication is turned on, you must also 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>
+attributes. If both authentication and SQL authorization are turned on, the user
+must be the database owner.</p>
 <p>You may not specify this attribute in conjunction with any attributes not
 mentioned in this section.</p>
 </section>

Modified: db/derby/docs/branches/10.8/src/ref/rrefattribstartslave.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/ref/rrefattribstartslave.dita?rev=1099093&r1=1099092&r2=1099093&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/ref/rrefattribstartslave.dita (original)
+++ db/derby/docs/branches/10.8/src/ref/rrefattribstartslave.dita Tue May  3 15:36:08 2011
@@ -65,13 +65,13 @@ default value is <codeph>localhost</code
 href="rrefattribslaveport.dita#rrefattribslaveport">slavePort=portValue</xref></i>
 attribute. If you do not specify the <i>slavePort=portValue</i> attribute, the
 default port value is 4851.</p>
-<p>If authentication or authorization is turned on, you
-must also specify this attribute in conjunction with the <i><xref
+<p>If authentication is turned on, you must also 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>
+attributes. If both authentication and SQL authorization are turned on, the user
+must be the database owner.</p>
 <p>You may not specify this attribute in conjunction with any attributes not
 mentioned in this section.</p>
 </section>

Modified: db/derby/docs/branches/10.8/src/ref/rrefattribstopmaster.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/src/ref/rrefattribstopmaster.dita?rev=1099093&r1=1099092&r2=1099093&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/src/ref/rrefattribstopmaster.dita (original)
+++ db/derby/docs/branches/10.8/src/ref/rrefattribstopmaster.dita Tue May  3 15:36:08 2011
@@ -46,13 +46,13 @@ database.</p>
 subprotocol or by using the <i><xref
 href="rrefattrib17246.dita#rrefattrib17246">databaseName=nameofDatabase</xref></i>
 attribute.</p>
-<p>If authentication or authorization is turned on, you
-must also specify this attribute in conjunction with the <i><xref
+<p>If authentication is turned on, you must also 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>
+attributes. If both authentication and SQL authorization are turned on, the user
+must be the database owner.</p>
 <p>You may not specify this attribute in conjunction with any attributes not
 mentioned in this section.</p>
 </section>