svn commit: r505121 - in /db/derby/docs/trunk/src: adminguide/tadminconfigshuttingdownthenetworkserver.dita devguide/cdevstart16043.dita devguide/cdevstart813142.dita getstart/cgsinstallingderby.dita

[fu...@apache.org]

Author: fuzzylogic
Date: Thu Feb  8 17:49:26 2007
New Revision: 505121

URL: http://svn.apache.org/viewvc?view=rev&rev=505121
Log:
DERBY-1709: Deprecate frameworks scripts. This patch covers the remaining 
appearances of the frameworks scripts in the documentation not already removed
by the DERBY-1662 changes.

Patch committed for Kim Haase <ca...@sun.com>

Modified:
    db/derby/docs/trunk/src/adminguide/tadminconfigshuttingdownthenetworkserver.dita
    db/derby/docs/trunk/src/devguide/cdevstart16043.dita
    db/derby/docs/trunk/src/devguide/cdevstart813142.dita
    db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita

Modified: db/derby/docs/trunk/src/adminguide/tadminconfigshuttingdownthenetworkserver.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/tadminconfigshuttingdownthenetworkserver.dita?view=diff&rev=505121&r1=505120&r2=505121
==============================================================================
--- db/derby/docs/trunk/src/adminguide/tadminconfigshuttingdownthenetworkserver.dita (original)
+++ db/derby/docs/trunk/src/adminguide/tadminconfigshuttingdownthenetworkserver.dita Thu Feb  8 17:49:26 2007
@@ -34,11 +34,13 @@
 conref="adminconrefs.dita#prod/productshortname"></ph> server.</p></context>
 <steps-unordered>
 <step><cmd>To shut down the Network Server by using the scripts that are provided
-for Windows systems, use:</cmd><stepxmp><codeblock>stopNetworkServer.bat [-h <i>&lt;hostname&gt;</i>] [-p <i>&lt;portnumber&gt;</i>] </codeblock></stepxmp>
+for Windows systems, use:</cmd><stepxmp>
+<codeblock><b><userinput>stopNetworkServer.bat [-h <varname>hostname</varname>] [-p <varname>portnumber</varname>]</userinput></b></codeblock></stepxmp>
 </step>
 <step><cmd>To shut down the Network Server by using the scripts that are provided
-for UNIX systems, use:</cmd><stepxmp><codeblock>stopNetworkServer.ksh [-h <i>&lt;hostname&gt;</i>] [-p <i>&lt;portnumber&gt;</i>] </codeblock></stepxmp>
-<info>These scripts are located in the $<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>/frameworks/NetworkServer/bin
+for UNIX systems, use:</cmd><stepxmp>
+<codeblock><b><userinput>stopNetworkServer [-h <varname>hostname</varname>] [-p <varname>portnumber</varname>]</userinput></b></codeblock></stepxmp>
+<info>These scripts are located in the <codeph>$<ph conref="adminconrefs.dita#prod/productinstallpath"></ph>/bin</codeph>
 directory.</info></step>
 </steps-unordered>
 </taskbody>

Modified: db/derby/docs/trunk/src/devguide/cdevstart16043.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevstart16043.dita?view=diff&rev=505121&r1=505120&r2=505121
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstart16043.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstart16043.dita Thu Feb  8 17:49:26 2007
@@ -48,13 +48,13 @@
 documentation.</li>
 <li><i>RELEASE-NOTES.html</i>, in the top-level <ph conref="devconrefs.dita#prod/productshortname"></ph> base
 directory, contains important last-minute information. <i>Read it first</i>.</li>
+<li><i>/bin</i> contains utilities and scripts for running <ph conref="devconrefs.dita#prod/productshortname"></ph>. </li>
 <li><i>/demo</i> contains some sample applications, useful scripts, and prebuilt
 databases.   <ul>
 <li><i>/databases</i> includes prebuilt sample databases.</li>
 <li><i>/programs</i> includes sample applications.</li>
 </ul></li>
 <li><i>/docs</i> contains the on-line documentation (including this document).</li>
-<li><i>/frameworks</i> contains utilities and scripts for running <ph conref="devconrefs.dita#prod/productshortname"></ph>. </li>
 <li><i>/javadoc</i> contains the documented APIs for the public classes and
 interfaces. Typically, you use the JDBC interface to interact with <ph conref="devconrefs.dita#prod/productshortname"></ph>;
 however, you can use some of these additional classes in certain situations.</li>

Modified: db/derby/docs/trunk/src/devguide/cdevstart813142.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevstart813142.dita?view=diff&rev=505121&r1=505120&r2=505121
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstart813142.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstart813142.dita Thu Feb  8 17:49:26 2007
@@ -20,7 +20,7 @@
 -->
 <concept id="cdevstart813142" xml:lang="en-us">
 <title>Batch files and shell scripts</title>
-<shortdesc>The <i>/frameworks/embedded/bin</i> directory contains scripts
+<shortdesc>The <i>/bin</i> directory contains scripts
 for running some of the <ph conref="devconrefs.dita#prod/productshortname"></ph> tools
 and utilities. To customize your environment, put the directory first in your
 path.</shortdesc>
@@ -30,7 +30,7 @@
 </metadata></prolog>
 <conbody>
 <p>These scripts serve as examples to help you get started with these tools
-and utilities on any platform. However, they can require modification in order
+and utilities on any platform. However, they may require modification in order
 to run properly on certain platforms.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita?view=diff&rev=505121&r1=505120&r2=505121
==============================================================================
--- db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita (original)
+++ db/derby/docs/trunk/src/getstart/cgsinstallingderby.dita Thu Feb  8 17:49:26 2007
@@ -64,7 +64,7 @@
 <li>The <filepath>lib</filepath> subdirectory contains the <ph conref="gsconrefs.dita#prod/productshortname"></ph> jar 
 files.</li>
 <li>The <filepath>test</filepath> subdirectory contains regression tests for <ph conref="gsconrefs.dita#prod/productshortname"></ph>.</li>
-<li>The <filepath>frameworks</filepath> subdirectory contains older style scripts for executing utilities and setting up the environment. These are provided in this release for backward compatibility. In a next release, they will be deprecated in favor of the scripts in the <filepath>bin</filepath> directory. </li>
+<li>The <filepath>frameworks</filepath> subdirectory contains older scripts for executing utilities and setting up the environment. These are provided in this release for backward compatibility. These scripts are deprecated in favor of the scripts in the <filepath>bin</filepath> directory, and will be removed in a future release. </li>
 </ul></p>
 </conbody>
 </concept>