1 files changed, 19 insertions, 48 deletions
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index e929e4a2cf3..37e097a24b1 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -199,20 +199,13 @@ multicast requests.</TD></TR>
 <TD><CODE>-ORBNameServiceIOR</CODE> <EM>ior</EM></TD>
 <TD>Specifies the IOR for the Naming Service.</TD></TR>
 <TR>
-<TD><CODE>-ORBTradingServiceIOR</CODE> <EM>ior</EM></TD>
-<TD>Specifies the IOR for the Trading Service.</TD></TR>
+<TD><CODE>-ORBTradingServiceIOR"</CODE> <EM>ior</EM></TD>
+<TD>Specifiles the IOR for the Trading Service.</TD></TR>
 <TR>
-<TD><CODE>-ORBTradingServicePort</CODE> <EM>portspec</EM></TD>
+<TD><CODE>-ORBTradingServicePort"</CODE> <EM>portspec</EM></TD>
 <TD>Specifies to which port the Trading Service is listening on for
     multicast requests.</TD></TR>
 <TR>
-<TD><CODE>-ORBImplRepoIOR</CODE> <EM>ior</EM></TD>
-<TD>Specifies the IOR for the Implementation Repository.</TD></TR>
-<TR>
-<TD><CODE>-ORBImplRepoPort</CODE> <EM>portspec</EM></TD>
-<TD>Specifies to which port the Implementation Repository is listening on for
-    multicast requests.</TD></TR>
-<TR>
 <TD><CODE>-ORBCollocation</CODE> <EM>yes/no</EM></TD>
 <TD>Specifies the use of collocation object optimization.  Default is yes.</TD></TR>
 <TR>
@@ -298,20 +291,6 @@ which is not reentrant.</TD></TR>
               in GIOP 1.1
               The default value is controlled by a compile-time flag
               (check orbconf.h).</TD></TR>
-
-<TR>
-<TD><CODE>-ORBResources</CODE> <EM>which</EM></TD>
-<TD><A name=-ORBResources>Control the use of thread specific resources
-                in the ORB.
-                If (<em>which</em> = <code>global</code>) then the
-                same set of resources are shared by all the threads
-                that use that ORB.
-                If (<em>which</em> = <code>tss</code>) then each that
-                uses that ORB gets its own set of resources.
-                Currently the resources are limited to the reactor.
-            </TD></TR>
-<TR>
-
 </TABLE>
 </P>
 </blockquote>
@@ -327,11 +306,7 @@ which is not reentrant.</TD></TR>
 <TD><CODE>-ORBResources</CODE> <EM>which</EM></TD>
 <TD>Specify whether each thread uses a global
 (<em>which</em> = <code>global</code>) or a thread-specific
-(<em>which</em> = <code>tss</code>) instance for the resources it
-              returns.
-              <B>NOTE:</B> This option controls the default value for
-	      the ORB option of the same name.</A>.
-</TD></TR>
+(<em>which</em> = <code>tss</code>) instance for the resources it returns.</TD></TR>
 <TR>
 <TD><CODE>-ORBReactorLock</CODE> <EM>which</EM></TD>
 <TD><a name="-ORBReactorLock"></a>Specify whether the ORB reactor is
@@ -354,26 +329,22 @@ which is not reentrant.</TD></TR>
   <TR><TD><CODE>select_st<CODE></TD><TD>Use the
                     <CODE>ACE_Select_Reactor</CODE> with null locks
                   </TD></TR>
-  <TR><TD><CODE>fl<CODE></TD><TD>Use the
+  <TR><TD><CODE>fl_reactor<CODE></TD><TD>Use the
                     <CODE>ACE_FlReactor</CODE> only available if ACE
                     was compiled with support for the FL toolkit
                   </TD></TR>
-  <TR><TD><CODE>xt<CODE></TD><TD>Use the
-                    <CODE>ACE_XtReactor</CODE> only available if ACE
+  <TR><TD><CODE>xt_reactor<CODE></TD><TD>Use the
+                    <CODE>ACE_FlReactor</CODE> only available if ACE
                     was compiled with support for the XWindows Toolkit
                   </TD></TR>
-  <TR><TD><CODE>wfmo<CODE></TD><TD>Use the
+  <TR><TD><CODE>WFMO<CODE></TD><TD>Use the
                     <CODE>ACE_WFMO_Reactor</CODE> only available on
                     Win32 platforms.
                   </TD></TR>
-  <TR><TD><CODE>msg_wfmo<CODE></TD><TD>Use the
+  <TR><TD><CODE>MsgWFMO<CODE></TD><TD>Use the
                     <CODE>ACE_Msg_WFMO_Reactor</CODE> only available on
                     Win32 platforms.
                   </TD></TR>
-  <TR><TD><CODE>tp<CODE></TD><TD>Use the
-                    <CODE>ACE_TP_Reactor</CODE>, a select based
-                    thread-pool reactor.
-                  </TD></TR>
   </TABLE>
   The default is <code>select_mt</code></TD></TR>
 <TR>
@@ -384,17 +355,17 @@ which is not reentrant.</TD></TR>
 <TR>
 <TD><CODE>-ORBInputCDRAllocator</CODE> <EM>which</EM></TD>
 <TD><a name="-ORBInputCDRAllocator"></a>
-              Specify whether the ORB uses locked
-              (<em>which</em> = <code>thread</code>)
-              or lock-free (<em>which</em> = <code>null</code>)
-              allocators for the incoming CDR buffers.
-              Though <CODE>null</CODE> should give the
+              Specify whether the ORB uses a global
+              (<em>which</em> = <code>global</code>)
+              or a per-thread (<em>which</em> = <code>tss</code>)
+              allocator for the incoming CDR buffers.
+              Though <CODE>tss</CODE> should give the
               optimal performance;
-              we made the default <CODE>thread</CODE>.
-              TAO optimizations for octet sequences will not work in all cases when
-              if the allocator does not have locks (for example if the
-              octet sequences are part of a return value.
-              Using locked allocators also allows the users to
+              we made the default <CODE>global</CODE>.
+              TAO optimizations for octet sequences will not work when
+              returning that data type if the allocator is
+              <CODE>tss</CODE>.
+              Using global allocator also allows the users to
               take advantage of the TAO octet sequence
               extensions to preserve the buffer after the upcall.
             </TD></TR>