summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2004-03-16 19:37:34 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2004-03-16 19:37:34 +0000
commitcdb6fa70bfa8bf330883819e74de9734ae888969 (patch)
tree7ddabd82ae1632c01bcca73e444620b5b51b6e61
parenta7a10ee1788b9161825663ba89df02f5ee1436b9 (diff)
downloadATCD-cdb6fa70bfa8bf330883819e74de9734ae888969.tar.gz
ChangeLogTag:Tue Mar 16 10:48:48 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--ChangeLog2
-rw-r--r--TAO/CIAO/docs/index.html12
-rw-r--r--TAO/docs/Options.html4
3 files changed, 8 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index ef1d1381b50..503a6137691 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,4 @@
Tue Mar 16 10:48:48 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-
* ace/Logging_Strategy.cpp:
@@ -12,7 +11,6 @@ Tue Mar 16 10:48:48 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Thanks to Oliver Kellog for providing the patches.
-
Tue Mar 16 09:40:36 2004 Chad Elliott <elliott_c@ociweb.com>
* bin/MakeProjectCreator/modules/TemplateParser.pm:
diff --git a/TAO/CIAO/docs/index.html b/TAO/CIAO/docs/index.html
index ddc4e2eef48..0f23f62e3f0 100644
--- a/TAO/CIAO/docs/index.html
+++ b/TAO/CIAO/docs/index.html
@@ -64,16 +64,16 @@ Visio file</a> (The same file in Visio V.5 format is <a href="imgs/CCM-v5.vsd">h
<h2>CIAO part-by-part</h2>
-Here is a list of the major parts (I don't want to use the word "component" to confuse you :) of CIAO that a user should be aware of.
+Here is a list of the major elements of CIAO that a user should be aware of.
<UL>
- <li><a href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/tools/daemon/index.html"><strong>Daemon:</strong></a> A CIAO Daemon is the per-host Daemon process which is used to create/spawn the ComponentServer.</li>
+ <li><a href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/tools/daemon/index.html"><strong>Daemon:</strong></a> A CIAO Daemon is the per-host Daemon process which is used to create/spawn the ComponentServer.</li><P>
- <li><a href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/ciao/index.html"><strong>ComponentServer:</strong></a> A ComponentServer is the center part of CIAO. It's responsible for component/home creation.</li>
+ <li><a href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/ciao/index.html"><strong>ComponentServer:</strong></a> A ComponentServer is the center part of CIAO. It's responsible for component/home creation.</li><P>
- <li><a href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/tools/assembly_deployer/index.html"><strong>AssemblyDeployer:</strong></a> An AssemblyDeployer is responsible for starting the Assembly process.</li>
+ <li><a href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/tools/assembly_deployer/index.html"><strong>AssemblyDeployer:</strong></a> An AssemblyDeployer is responsible for starting the Assembly process.</li><P>
- <li><a href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/tools/assembly_deployer/index.html"><strong>AssemblyManager:</strong></a> An AssemblyManager is the center part to do the Assembly work.</li>
+ <li><a href="http://www.dre.vanderbilt.edu/Doxygen/Current/html/tao/ciao/tools/assembly_deployer/index.html"><strong>AssemblyManager:</strong></a> An AssemblyManager is the center part to do the Assembly work.</li><P>
<li><a href="static_ciao_index.html"><strong>Static Configurator:</strong> </a>The CIAO
Static Configurator acts as a pre-processor that parses the XML descriptor
@@ -89,7 +89,7 @@ shared objects or DLL.</li>
We have two Hello tutorials to help the user to understand CCM/CIAO.
<UL>
- <li><a href="./tutorial/Hello"><code>$(CIAO_ROOT)/docs/tutorial/Hello.</code></a> This example shows the low level infomation about CIAO Component/Component Home creation and deletion.</li>
+ <li><a href="./tutorial/Hello"><code>$(CIAO_ROOT)/docs/tutorial/Hello.</code></a> This example shows the low level infomation about CIAO Component/Component Home creation and deletion.</li><P>
<li><a href="../examples/Hello"><code>$(CIAO_ROOT)/examples/Hello.</code></a> This example illustrates how to build a CIAO based application <a href="../examples/Hello/step-by-step.html">step-by-step</a>. There is also a detailed documentation explaining this example avalable in both <a href="http://www.dre.vanderbilt.edu/~lu/CCM/CCM_Hello_example.PDF"> PDF</a> and <a href="http://www.dre.vanderbilt.edu/~lu/CCM/CCM_Hello_example.ppt"> PowerPoint</a> format.</li>
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index c4136fd553e..35195d6391a 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -998,8 +998,8 @@ threads periodically poll the ORB to find out if they should shutdown.
This option controls the period of the polling, expressed in
milliseconds. Applications that do not shutdown, or that can otherwise
ensure that no server threads will be running at shutdown (for example
-if all the clients terminate before the server) can disable the polling
-using the magic value <code>INFINITE</code>.
+if all the clients terminate before the server) can disable the
+polling using the magic value <code>INFINITE</code>.
<p>If the option is not provided then the ORB uses the
compile-time flag <code>TAO_DEFAULT_THREAD_PER_CONNECTION_TIMEOUT</code>,
this flag also expresses the time in milliseconds (as a string