BIND 10 trac2850_2, updated. 7d1a2ca88d0daac2779ecccf50c4308eb0914ebd [2850] Don't use the term "load" when describing what reset() does

[BIND 10 source code commits]

The branch, trac2850_2 has been updated
       via  7d1a2ca88d0daac2779ecccf50c4308eb0914ebd (commit)
       via  ad233427c14503e34980780761700596f13e14f4 (commit)
      from  0dccb67c0e49f3448e7fc3da7a5e414113bf36dc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7d1a2ca88d0daac2779ecccf50c4308eb0914ebd
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon May 6 10:15:03 2013 +0530

    [2850] Don't use the term "load" when describing what reset() does

commit ad233427c14503e34980780761700596f13e14f4
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon May 6 10:10:05 2013 +0530

    [2850] Update comment to match code

-----------------------------------------------------------------------

Summary of changes:
 src/lib/datasrc/memory/zone_table_segment.h        |   29 ++++++++++----------
 .../datasrc/memory/zone_table_segment_mapped.cc    |    4 +--
 2 files changed, 16 insertions(+), 17 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/zone_table_segment.h b/src/lib/datasrc/memory/zone_table_segment.h
index 0c95d8d..197ac08 100644
--- a/src/lib/datasrc/memory/zone_table_segment.h
+++ b/src/lib/datasrc/memory/zone_table_segment.h
@@ -198,24 +198,23 @@ public:
         READ_ONLY
     };
 
-    /// \brief Unload the current memory store (if loaded) and load the
+    /// \brief Close the current memory store (if open) and open the
     /// specified one.
     ///
-    /// In case opening/loading the new memory store fails for some
-    /// reason, one of the following documented (further below)
-    /// exceptions may be thrown. In case failures occur,
-    /// implementations of this method must strictly provide the
-    /// associated behavior as follows, and in the exception
-    /// documentation below.  Code that uses \c ZoneTableSegment would
-    /// depend on such assurances.
+    /// In case opening the new memory store fails for some reason, one
+    /// of the following documented (further below) exceptions may be
+    /// thrown. In case failures occur, implementations of this method
+    /// must strictly provide the associated behavior as follows, and in
+    /// the exception documentation below.  Code that uses
+    /// \c ZoneTableSegment would depend on such assurances.
     ///
     /// In case an existing memory store is in use, and an attempt to
-    /// load a different memory store fails, the existing memory store
+    /// open a different memory store fails, the existing memory store
     /// must still be available and the \c ResetFailed exception must be
     /// thrown. In this case, the segment is still usable.
     ///
     /// In case an existing memory store is in use, and an attempt is
-    /// made to reload the same memory store which results in a failure,
+    /// made to reopen the same memory store which results in a failure,
     /// the existing memory store must no longer be available and the
     /// \c ResetFailedAndSegmentCleared exception must be thrown. In
     /// this case, the segment is no longer usable without a further
@@ -233,13 +232,13 @@ public:
     /// has incorrect syntax, but the segment is still usable due to the
     /// old memory store still being in use.
     ///
-    /// \throw ResetFailed if there was a problem in loading the new
+    /// \throw ResetFailed if there was a problem in opening the new
     /// memory store, but the segment is still usable due to the old
     /// memory store still being in use.
     ///
     /// \throw ResetFailedAndSegmentCleared if there was a problem in
-    /// loading the new memory store, but the old memory store was also
-    /// unloaded and is no longer in use. The segment is not usable
+    /// opening the new memory store, but the old memory store was also
+    /// closed and is no longer in use. The segment is not usable
     /// without a further successful \c reset().
     ///
     /// \param mode The open mode (see the MemorySegmentOpenMode
@@ -249,9 +248,9 @@ public:
     virtual void reset(MemorySegmentOpenMode mode,
                        isc::data::ConstElementPtr params) = 0;
 
-    /// \brief Unload the current memory store (if loaded).
+    /// \brief Close the current memory store (if open).
     ///
-    /// Implementations of this method should unload any current memory
+    /// Implementations of this method should close any current memory
     /// store and reset the `ZoneTableSegment` to a freshly constructed
     /// state.
     ///
diff --git a/src/lib/datasrc/memory/zone_table_segment_mapped.cc b/src/lib/datasrc/memory/zone_table_segment_mapped.cc
index 39ef31e..ccd172e 100644
--- a/src/lib/datasrc/memory/zone_table_segment_mapped.cc
+++ b/src/lib/datasrc/memory/zone_table_segment_mapped.cc
@@ -194,8 +194,8 @@ ZoneTableSegmentMapped::openReadWrite(const std::string& filename,
 
 void
 ZoneTableSegmentMapped::openReadOnly(const std::string& filename) {
-    // In case there is a checksum mismatch, we throw. We want the
-    // segment to be automatically destroyed then.
+    // In case the checksum or table header is missing, we throw. We
+    // want the segment to be automatically destroyed then.
     std::auto_ptr<MemorySegmentMapped> segment
         (new MemorySegmentMapped(filename));
     // There must be a previously saved checksum.