Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO

# Conflicts:
#	ACE/protocols/ace/HTBP/HTBP_Channel.cpp
#	ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
#	ACE/protocols/ace/HTBP/HTBP_Session.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/ACE/examples/APG/ThreadPools/TP_Reactor.cpp b/ACE/examples/APG/ThreadPools/TP_Reactor.cpp
index b8dd9a5b6c6..6386ee129bb 100644
--- a/ACE/examples/APG/ThreadPools/TP_Reactor.cpp
+++ b/ACE/examples/APG/ThreadPools/TP_Reactor.cpp
@@ -31,7 +31,7 @@ static size_t svr_thrno = 5;
 // Total number of client threads.
 static size_t cli_runs = 2;
 
-// Total connection attemps of a client thread.
+// Total connection attempts of a client thread.
 static size_t cli_conn_no = 2;
 
 // Total requests a client thread sends.