Browse Source

[trac452] Language corrections

Michal 'vorner' Vaner 14 years ago
parent
commit
3048f118d4

+ 1 - 1
src/bin/auth/auth_srv.cc

@@ -361,7 +361,7 @@ AuthSrv::setStatisticsTimerInterval(uint32_t interval) {
         return;
     }
     if (interval > 86400) {
-        // It can't be occur since the value is checked in
+        // It can't occur since the value is checked in
         // statisticsIntervalConfig::build().
         isc_throw(InvalidParameter, "Too long interval: " << interval);
     }

+ 2 - 2
src/bin/auth/config.cc

@@ -179,11 +179,11 @@ public:
     virtual void build(ConstElementPtr config_value) {
         const int32_t config_interval = config_value->intValue();
         if (config_interval < 0) {
-            isc_throw(AuthConfigError, "negative statistics-interval value: "
+            isc_throw(AuthConfigError, "negative statistics interval value: "
                       << config_interval);
         }
         if (config_interval > 86400) {
-            isc_throw(AuthConfigError, "too long statistics-interval value: "
+            isc_throw(AuthConfigError, "Too long statistics interval value: "
                       << config_interval);
         }
         interval_ = config_interval;

+ 1 - 1
src/lib/asiolink/asiolink.h

@@ -585,7 +585,7 @@ private:
 /// The type of call back function is \c void(void).
 /// 
 /// The call back function will not be called if the instance of this class is
-/// destructed before the timer is expired.
+/// destroyed before the timer is expired.
 ///
 /// Note: Destruction of an instance of this class while call back is pending
 /// causes throwing an exception from \c IOService.

+ 4 - 4
src/lib/asiolink/tests/asiolink_unittest.cc

@@ -899,7 +899,7 @@ TEST_F(IntervalTimerTest, destructIntervalTimer) {
     // the program would immediately terminate anyway.
 
     // The call back function will not be called after the timer is
-    // destructed.
+    // destroyed.
     //
     // There are two timers:
     //  itimer_counter (A)
@@ -908,16 +908,16 @@ TEST_F(IntervalTimerTest, destructIntervalTimer) {
     //  itimer_canceller (B)
     //   (Calls TimerCallBackCancelDeleter)
     //     - first time of callback, it stores the counter value of
-    //       callback_canceller and destructs itimer_counter
+    //       callback_canceller and destroys itimer_counter
     //     - second time of callback, it compares the counter value of
     //       callback_canceller with stored value
     //       if they are same the timer was not called; expected result
-    //       if they are different the timer was called after destructed
+    //       if they are different the timer was called after destroyed
     //
     //     0  100  200  300  400  500  600 (ms)
     // (A) i--------+----x
     //                   ^
-    //                   |destruct itimer_counter
+    //                   |destroy itimer_counter
     // (B) i-------------+--------------s
     //                                  ^stop io_service
     //                                   and check if itimer_counter have been