updated docs

1 files changed, 43 insertions, 40 deletions

diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index 275af001409..a68a86305eb 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -9,19 +9,19 @@
 
 <H2>Overview</H2>
 
-<P>Certain components in TAO can be tuned by users by passing options
-to components.  
-<!-- Chris, can you please define what is meant by a "component", -->
-<!-- e.g., ORB Core, Object Adapter, etc. --> 
-These options are commonly specified as strings (<EM>e.g.</EM>, passed
-on the command-line) and are passed to component initialization
-methods for consumption.</P>
+<P>Certain components in TAO such as the ORB Core or object adapter
+can be tuned by users by providing value for options to them.  These
+options are commonly specified as strings (<EM>e.g.</EM>, passed on
+the command-line) and are passed to component initialization methods
+for consumption.</P>
 
 <P><EM>Programmer's Note:</EM> the internal structure for these
 options is the traditional <CODE>argc</CODE>/<CODE>argv</CODE> vector
-of strings style popularized by C and Unix.  By convention, any
-initialization method will consume, <EM>i.e.</EM> ,remove from the
-vector, any options that it recognizes.</P>
+of strings style popularized by C and Unix.  By convention, an
+initialization method will <b>NOT</b> consume, <EM>i.e.</EM> ,remove
+from the vector, any options that it recognizes.  Rather, it will
+leave those options intact, and it will also simply ignore any options
+is does not recognize as its own.</P>
 
 <H2>Types of Options</H2>
 
@@ -31,7 +31,7 @@ vector, any options that it recognizes.</P>
 
 <UL>
   <LI><A HREF="#ORB"><CODE>CORBA::ORB</CODE></A>
-  <LI><A HREF="#BOA"><CODE>CORBA::BOA</CODE></A>
+  <LI><A HREF="#POA"><CODE>CORBA::POA</CODE></A>
   <LI><A HREF="#DefaultServer"><CODE>TAO_Default_Server_Strategy_Factory</CODE></A>
   <LI><A HREF="#DefaultClient" TARGET="_top"><CODE>TAO_Default_Client_Strategy_Factory</CODE></A>
 </UL>
@@ -58,42 +58,34 @@ directives <EM>ala</EM> ACE's Service Configurator.</TD></TR>
 <TD HEIGHT="17"><CODE>-ORBdebug</CODE></TD>
 <TD>Turns on the output of debugging messages within ACE's Service Configurator
 componentry.</TD></TR>
-</TABLE>
-</P>
-
-<H3><CODE>CORBA::BOA</CODE><A NAME="BOA"></A></H3>
-
-<P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" WIDTH="100%">
-<TR>
-<TH WIDTH="43%">Option</TH>
-<TH WIDTH="55%">Description</TH></TR>
-<TR>
-<TD><CODE>-OAid</CODE> <EM>OA Identifier</EM></TD>
-<TD>Associates <I><EM>OA Identifier</EM></I> with the Object Adapter.</TD></TR>
 <TR>
-<TD><CODE>-OAhost</CODE> <EM>hostname</EM></TD>
+<TD><CODE>-ORBhost</CODE> <EM>hostname</EM></TD>
 <TD>Tells the Object Adapter to listen for requests on the interface associated
-with the host named <I><EM>hostname</EM></I>. <STRONG>NOTE: This is a <EM>required</EM>
-argument.</STRONG></TD></TR>
+with the host named <I><EM>hostname</EM></I>.</TD></TR>
 <TR>
-<TD><CODE>-OAport</CODE> <EM>portspec</EM></TD>
+<TD><CODE>-ORBport</CODE> <EM>portspec</EM></TD>
 <TD>Tells the Object Adapter to listen for requests on the port specified by
 <I><EM>portspec</EM></I>, which can be a name as found in <TT>/etc/services</TT>
 or a number. The default is <TT>5001</TT>.</TD></TR>
 <TR>
-<TD><CODE>-OAobjdemux</CODE> <EM>demux_method</EM></TD>
+<TD><CODE>-ORBobjrefstyle</CODE> <EM>which</EM></TD>
+<TD>Specifies the user-visible style of object references. The range of values
+is <CODE>IOR</CODE>, which is the traditional nonsensical object reference,
+or <CODE>URL</CODE>, which looks more like a URL.</TD></TR>
+<TR>
+<TD><CODE>-ORBobjdemux</CODE> <EM>demux_method</EM></TD>
 <TD>Specifies the method used to demultiplex to an object. The range of values
 is <CODE>dynamic</CODE>, <CODE>linear</CODE>, <CODE>active</CODE>, or <CODE>user</CODE>.</TD></TR>
 <TR>
-<TD><CODE>-OAtablesize</CODE> <EM>object table size</EM></TD>
+<TD><CODE>-ORBtablesize</CODE> <EM>object table size</EM></TD>
 <TD>Specifies the size of the object table as a positive, non-zero integer.
 If not specified, the default is <TT>64</TT>.</TD></TR>
 <TR>
-<TD><CODE>-OArcvsock</CODE> <EM>receive buffer size</EM></TD>
+<TD><CODE>-ORBrcvsock</CODE> <EM>receive buffer size</EM></TD>
 <TD>Specify the size of the socket receive buffer as a positive, non-zero integer.
 If not specified, the system-dependent default is used.</TD></TR>
 <TR>
-<TD><CODE>-OAsndsock</CODE> <EM>send buffer size</EM></TD>
+<TD><CODE>-ORBsndsock</CODE> <EM>send buffer size</EM></TD>
 <TD>Specify the size of the socket send buffer as a positive, non-zero integer.
 If not specified, the system-dependent default is used.</TD></TR>
 <TR>
@@ -103,6 +95,18 @@ requests.</TD></TR>
 </TABLE>
 </P>
 
+<H3><CODE>CORBA::POA</CODE><A NAME="POA"></A></H3>
+
+<P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" WIDTH="100%">
+<TR>
+<TH WIDTH="43%">Option</TH>
+<TH WIDTH="55%">Description</TH></TR>
+<TR>
+<TD><CODE>-OAid</CODE> <EM>OA Identifier</EM></TD>
+<TD>Associates <I><EM>OA Identifier</EM></I> with the Object Adapter.</TD></TR>
+</TABLE>
+</P>
+
 <H3><CODE>TAO_Default_Server_Strategy_Factory</CODE><A NAME="DefaultServer"></A></H3>
 
 <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" WIDTH="100%" HEIGHT=
@@ -111,23 +115,22 @@ requests.</TD></TR>
 <TH WIDTH="43%" HEIGHT="17">Option</TH>
 <TH WIDTH="55%">Description</TH></TR>
 <TR>
-<TD HEIGHT="43"><CODE>-t </CODE><EM>thread flags</EM></TD>
+<TD HEIGHT="43"><CODE>-ORBthreadflags</CODE> <EM>thread flags</EM></TD>
 <TD>Specify the flags used for thread creation. Flags can be any logical-OR
 combination of <CODE>THR_DETACHED</CODE>, <CODE>THR_BOUND</CODE>, <CODE>THR_NEW_LWP</CODE>,
 <CODE>THE_SUSPENDED</CODE>.</TD></TR>
 <TR>
-<TD HEIGHT="30"><CODE>-s </CODE><EM>object table size</EM></TD>
+<TD HEIGHT="30"><CODE>-ORBtablesize</CODE> <EM>object table size</EM></TD>
 <TD>Specify the size of the object table. If not specified, the default value
 is 64.</TD></TR>
 <TR>
-<TD HEIGHT="17"><CODE>-R</CODE></TD>
-<TD>Use Reactive concurrency strategy.</TD></TR>
-<TR>
-<TD HEIGHT="17"><CODE>-T</CODE></TD>
-<TD>Use Thread-per-connection concurrency strategy.</TD></TR>
+<TD HEIGHT="17"><CODE>-ORBconcurrency</CODE> <EM>which</EM></TD>
+<TD>Specify which concurrency strategy to use.  Range of values is <code>reactive</code>
+for a purely Reactor-driven concurrency strategy or
+<code>thread-per-connection</code> for creating a new thread to service each connection.</TD></TR>
 <TR>
-<TD HEIGHT="43"><CODE>-L </CODE><EM>lookup strategy</EM></TD>
-<TD>Specify the demultiplexing lookup strategy. The <EM>lookup strategy</EM>
+<TD HEIGHT="43"><CODE>-ORBdemuxstrategy</CODE> <EM>demultiplexing strategy</EM></TD>
+<TD>Specify the demultiplexing lookup strategy. The <EM>demultiplexing strategy</EM>
 can be one of <CODE>dynamic</CODE>, <CODE>linear</CODE>, <CODE>active</CODE>,
 or <CODE>user</CODE>.</TD></TR>
 </TABLE>