summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2008-06-22 17:05:12 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2008-06-22 17:05:12 +0000
commit58433d6f52cca92581ea37e7a051d3c2e244cdaf (patch)
treeda8d1d8bcb5c6d2db27635c353a5c7deb9a511a7
parent64ce482664a4f79022ea6c92c0e433e2c8faae00 (diff)
downloadATCD-58433d6f52cca92581ea37e7a051d3c2e244cdaf.tar.gz
ChangeLogTag:Fri
-rw-r--r--ACE/ace/Reactor.h3
-rw-r--r--TAO/ChangeLog5
-rw-r--r--TAO/docs/components.html2
3 files changed, 7 insertions, 3 deletions
diff --git a/ACE/ace/Reactor.h b/ACE/ace/Reactor.h
index 0941f4a3b7e..6e7bde775db 100644
--- a/ACE/ace/Reactor.h
+++ b/ACE/ace/Reactor.h
@@ -51,8 +51,7 @@ class ACE_Sig_Set;
/**
* @class ACE_Reactor
*
- * @brief The responsibility of this class is to forward all methods to
- * its delegation/implementation class, e.g.,
+ * @brief This class forwards all methods to its delegation/implementation class, e.g.,
* ACE_Select_Reactor or ACE_WFMO_Reactor.
*/
class ACE_Export ACE_Reactor : public ACE_Reactor_Timer_Interface
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f033a4aa0b7..4e379313878 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 20 19:53:02 UTC 2008 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu>
+
+ * docs/components.html: Fixed a minor formatting error.
+
Fri Jun 20 20:33:41 UTC 2008 Steve Huston <shuston@riverace.com>
* tests/AMH_Exceptions/run_test.pl:
@@ -44,6 +48,7 @@ Fri Jun 20 12:23:19 UTC 2008 Chad Elliott <elliott_c@ociweb.com>
Removed static_cast's that are no longer needed.
+>>>>>>> .r82113
Thu Jun 19 17:38:09 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com>
* tests/Reliable_Oneways/client.cpp:
diff --git a/TAO/docs/components.html b/TAO/docs/components.html
index 2f8d5fcf34b..09f46cd2dcc 100644
--- a/TAO/docs/components.html
+++ b/TAO/docs/components.html
@@ -42,7 +42,7 @@ bgcolor="#ffffff">
reduce the compilation times and memory footprints for
ACE+TAO and its applications. <P>
- <dt> <img alt="o" src="redball.gif"> <a HREF="Tags.html">Tags and Magic Numbers</a> </dt><P>
+ <LI> <a HREF="Tags.html">Tags and Magic Numbers</a> </dt><P>
</UL>
</BODY>