Merge pull request #943 in HDFFV/hdf5 from develop to hdf5_1_10

* commit '9247388c3d14510341ea3f07847ce2cbb6e44a8e':
  Rework new tests into one macro
  Added a "won't fix" RELEASE.txt entry for HDFFV-10356.
  Fix CMake test names
  Fixed typo
  Add release note for HDFFFV-10397.
  Added a fix for HDFFV-10358.
  Fixed documentation Description:     - Updated the description of copy constructor for clarification.     - Removed unnecessary comments. Platforms tested:     Linux/64 (jelly)
  Enhancement to the tool h5clear (HDFFV-10360)
  Fix for HDFFV-10209 VDS SWMR test failure Free the object header when there are chksum retries.

51 files changed, 75 insertions, 145 deletions

diff --git a/c++/src/H5AbstractDs.h b/c++/src/H5AbstractDs.h
index 16bef66..399e033 100644
--- a/c++/src/H5AbstractDs.h
+++ b/c++/src/H5AbstractDs.h
@@ -74,18 +74,6 @@ class H5_DLLCPP AbstractDs {
         // Default constructor
         AbstractDs();
 
-        // *** Deprecation warning ***
-        // The following two constructors are no longer appropriate after the
-        // data member "id" had been moved to the sub-classes.
-        // The copy constructor is a noop and is removed in 1.8.15 and the
-        // other will be removed from 1.10 release, and then from 1.8 if its
-        // removal does not raise any problems in two 1.10 releases.
-
-        // Mar 2016 -BMR, AbstractDs(const hid_t h5_id);
-
-        // Copy constructor
-        // AbstractDs( const AbstractDs& original );
-
    private:
         // This member function is implemented by DataSet and Attribute - pure virtual.
         virtual hid_t p_get_type() const = 0;
diff --git a/c++/src/H5ArrayType.cpp b/c++/src/H5ArrayType.cpp
index 49c31d2..836c837 100644
--- a/c++/src/H5ArrayType.cpp
+++ b/c++/src/H5ArrayType.cpp
@@ -46,7 +46,7 @@ ArrayType::ArrayType(const hid_t existing_id) : DataType(existing_id) {}
 
 //--------------------------------------------------------------------------
 // Function:    ArrayType copy constructor
-///\brief       Copy constructor: makes a copy of the original ArrayType object.
+///\brief       Copy constructor: same HDF5 object as \a original
 // Programmer   Binh-Minh Ribler - May 2004
 //--------------------------------------------------------------------------
 ArrayType::ArrayType(const ArrayType& original) : DataType(original) {}
diff --git a/c++/src/H5ArrayType.h b/c++/src/H5ArrayType.h
index 5443ae6..d99b936 100644
--- a/c++/src/H5ArrayType.h
+++ b/c++/src/H5ArrayType.h
@@ -50,7 +50,7 @@ class H5_DLLCPP ArrayType : public DataType {
         ///\brief Returns this class name.
         virtual H5std_string fromClass () const { return("ArrayType"); }
 
-        // Copy constructor: makes copy of the original object.
+        // Copy constructor: same as the original ArrayType.
         ArrayType(const ArrayType& original);
 
         // Constructor that takes an existing id
diff --git a/c++/src/H5AtomType.cpp b/c++/src/H5AtomType.cpp
index 5c24cf9..a9f6f36 100644
--- a/c++/src/H5AtomType.cpp
+++ b/c++/src/H5AtomType.cpp
@@ -47,7 +47,7 @@ AtomType::AtomType(const hid_t existing_id) : DataType(existing_id) {}
 
 //--------------------------------------------------------------------------
 // Function:    AtomType copy constructor
-///\brief       Copy constructor: makes a copy of the original AtomType object.
+///\brief       Copy constructor: same HDF5 object as \a original
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 AtomType::AtomType(const AtomType& original) : DataType(original) {}
diff --git a/c++/src/H5AtomType.h b/c++/src/H5AtomType.h
index 7ce66a0..80271ac 100644
--- a/c++/src/H5AtomType.h
+++ b/c++/src/H5AtomType.h
@@ -60,7 +60,7 @@ class H5_DLLCPP AtomType : public DataType {
         virtual H5std_string fromClass () const { return("AtomType"); }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-        // Copy constructor - makes copy of the original object
+        // Copy constructor: same as the original AtomType.
         AtomType(const AtomType& original);
 
         // Noop destructor
diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp
index d90857f..ccba623 100644
--- a/c++/src/H5Attribute.cpp
+++ b/c++/src/H5Attribute.cpp
@@ -51,7 +51,7 @@ Attribute::Attribute() : AbstractDs(), H5Location(), id(H5I_INVALID_HID) {}
 
 //--------------------------------------------------------------------------
 // Function:    Attribute copy constructor
-///\brief       Copy constructor: makes a copy of the original Attribute object.
+///\brief       Copy constructor: same HDF5 object as \a original
 ///\param       original  - IN: Original Attribute object to copy
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5Attribute.h b/c++/src/H5Attribute.h
index 823947e..c6fdaec 100644
--- a/c++/src/H5Attribute.h
+++ b/c++/src/H5Attribute.h
@@ -29,7 +29,7 @@ namespace H5 {
 class H5_DLLCPP Attribute : public AbstractDs, public H5Location {
    public:
 
-        // Copy constructor: makes a copy of an existing Attribute object.
+        // Copy constructor: same as the original Attribute.
         Attribute(const Attribute& original);
 
         // Default constructor
diff --git a/c++/src/H5CompType.cpp b/c++/src/H5CompType.cpp
index 3731fd4..8252d76 100644
--- a/c++/src/H5CompType.cpp
+++ b/c++/src/H5CompType.cpp
@@ -40,7 +40,7 @@ CompType::CompType() : DataType() {}
 
 //--------------------------------------------------------------------------
 // Function:    CompType copy constructor
-///\brief       Copy constructor: makes copy of the original CompType object
+///\brief       Copy constructor: same HDF5 object as \a original
 ///\param       original - IN: Original CompType instance
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5CompType.h b/c++/src/H5CompType.h
index a811b4a..d85e2ed 100644
--- a/c++/src/H5CompType.h
+++ b/c++/src/H5CompType.h
@@ -36,7 +36,7 @@ class H5_DLLCPP CompType : public DataType {
         // Gets the compound datatype of the specified dataset
         CompType(const DataSet& dataset);  // H5Dget_type
 
-        // Copy constructor - makes a copy of original object
+        // Copy constructor - same as the original CompType.
         CompType(const CompType& original);
 
         // Constructors that open a compound datatype, given a location.
diff --git a/c++/src/H5DataSet.cpp b/c++/src/H5DataSet.cpp
index fb9b57e..fbddd8d 100644
--- a/c++/src/H5DataSet.cpp
+++ b/c++/src/H5DataSet.cpp
@@ -68,7 +68,7 @@ DataSet::DataSet(const hid_t existing_id) : H5Object(), AbstractDs(), id(existin
 
 //--------------------------------------------------------------------------
 // Function:    DataSet copy constructor
-///\brief       Copy constructor: makes a copy of the original DataSet object.
+///\brief       Copy constructor: same HDF5 object as \a original
 ///\param       original - IN: DataSet instance to copy
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5DataSet.h b/c++/src/H5DataSet.h
index f9d2ec3..104ccea 100644
--- a/c++/src/H5DataSet.h
+++ b/c++/src/H5DataSet.h
@@ -93,7 +93,7 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
         // Default constructor.
         DataSet();
 
-        // Copy constructor.
+        // Copy constructor - same as the original DataSet.
         DataSet(const DataSet& original);
 
         // Creates a copy of an existing DataSet using its id.
diff --git a/c++/src/H5DataSpace.cpp b/c++/src/H5DataSpace.cpp
index b563da4..e8e5712 100644
--- a/c++/src/H5DataSpace.cpp
+++ b/c++/src/H5DataSpace.cpp
@@ -133,7 +133,7 @@ DataSpace::DataSpace(const hid_t existing_id) : IdComponent(), id(existing_id)
 
 //--------------------------------------------------------------------------
 // Function:    DataSpace copy constructor
-///\brief       Copy constructor: makes a copy of the original DataSpace object.
+///\brief       Copy constructor: same HDF5 object as \a original
 ///\param       original - IN: DataSpace object to copy
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5DataSpace.h b/c++/src/H5DataSpace.h
index ed141a3..54c68ac 100644
--- a/c++/src/H5DataSpace.h
+++ b/c++/src/H5DataSpace.h
@@ -36,7 +36,7 @@ class H5_DLLCPP DataSpace : public IdComponent {
         // Creates a DataSpace object using an existing dataspace id.
         DataSpace(const hid_t space_id);
 
-        // Copy constructor: makes a copy of the original DataSpace object.
+        // Copy constructor - same as the original DataSpace.
         DataSpace(const DataSpace& original);
 
         // Assignment operator
diff --git a/c++/src/H5DataType.cpp b/c++/src/H5DataType.cpp
index 032937d..a6b8c24 100644
--- a/c++/src/H5DataType.cpp
+++ b/c++/src/H5DataType.cpp
@@ -125,7 +125,7 @@ DataType::DataType(const H5Location& loc, const void* ref, H5R_type_t ref_type,
 
 //--------------------------------------------------------------------------
 // Function:    DataType copy constructor
-///\brief       Copy constructor: makes a copy of the original DataType object
+///\brief       Copy constructor: same HDF5 object as \a original
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 DataType::DataType(const DataType& original) : H5Object(), id(original.id), encoded_buf(NULL), buf_size(0)
diff --git a/c++/src/H5DataType.h b/c++/src/H5DataType.h
index 906ccef..52fd4de 100644
--- a/c++/src/H5DataType.h
+++ b/c++/src/H5DataType.h
@@ -30,7 +30,7 @@ class H5_DLLCPP DataType : public H5Object {
         // Creates a datatype given its class and size
         DataType(const H5T_class_t type_class, size_t size);
 
-        // Copy constructor: makes a copy of the original object
+        // Copy constructor - same as the original DataType.
         DataType(const DataType& original);
 
         // Creates a copy of a predefined type
diff --git a/c++/src/H5DcreatProp.cpp b/c++/src/H5DcreatProp.cpp
index 6ed77e3..0c2a8c0 100644
--- a/c++/src/H5DcreatProp.cpp
+++ b/c++/src/H5DcreatProp.cpp
@@ -95,7 +95,7 @@ DSetCreatPropList::DSetCreatPropList() : ObjCreatPropList(H5P_DATASET_CREATE) {}
 
 //--------------------------------------------------------------------------
 // Function:    DSetCreatPropList copy constructor
-///\brief       Copy constructor: makes a copy of the original
+///\brief       Copy constructor: same HDF5 object as \a original
 ///             DSetCreatPropList object
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5DcreatProp.h b/c++/src/H5DcreatProp.h
index 89318e8..9f54e8d 100644
--- a/c++/src/H5DcreatProp.h
+++ b/c++/src/H5DcreatProp.h
@@ -122,7 +122,7 @@ class H5_DLLCPP DSetCreatPropList : public ObjCreatPropList {
         ///\brief Returns this class name.
         virtual H5std_string fromClass () const { return("DSetCreatPropList"); }
 
-        // Copy constructor: creates a copy of a DSetCreatPropList object.
+        // Copy constructor - same as the original DSetCreatPropList.
         DSetCreatPropList(const DSetCreatPropList& orig);
 
         // Creates a copy of an existing dataset creation property list
diff --git a/c++/src/H5DxferProp.cpp b/c++/src/H5DxferProp.cpp
index 21e18e7..90ecf88 100644
--- a/c++/src/H5DxferProp.cpp
+++ b/c++/src/H5DxferProp.cpp
@@ -101,7 +101,7 @@ DSetMemXferPropList::DSetMemXferPropList(const char* exp) : PropList(H5P_DATASET
 
 //--------------------------------------------------------------------------
 // Function     DSetMemXferPropList copy constructor
-///\brief       Copy constructor: makes a copy of the original
+///\brief       Copy constructor: same HDF5 object as \a original
 ///             DSetMemXferPropList object
 ///\param       original - IN: Original dataset memory and transfer property
 ///                            list object to copy
diff --git a/c++/src/H5DxferProp.h b/c++/src/H5DxferProp.h
index 75205cf..6955778 100644
--- a/c++/src/H5DxferProp.h
+++ b/c++/src/H5DxferProp.h
@@ -102,7 +102,7 @@ class H5_DLLCPP DSetMemXferPropList : public PropList {
         ///\brief Returns this class name.
         virtual H5std_string fromClass () const { return("DSetMemXferPropList"); }
 
-        // Copy constructor: makes a copy of a DSetMemXferPropList object.
+        // Copy constructor - same as the original DSetMemXferPropList.
         DSetMemXferPropList(const DSetMemXferPropList& orig);
 
         // Creates a copy of an existing dataset memory and transfer
diff --git a/c++/src/H5EnumType.cpp b/c++/src/H5EnumType.cpp
index 91866d7..00b726c 100644
--- a/c++/src/H5EnumType.cpp
+++ b/c++/src/H5EnumType.cpp
@@ -53,7 +53,7 @@ EnumType::EnumType(const hid_t existing_id) : DataType( existing_id ) {}
 
 //--------------------------------------------------------------------------
 // Function:    EnumType copy constructor
-///\brief       Copy constructor: makes a copy of the original EnumType object.
+///\brief       Copy constructor: same HDF5 object as \a original
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 EnumType::EnumType(const EnumType& original) : DataType( original ) {}
diff --git a/c++/src/H5EnumType.h b/c++/src/H5EnumType.h
index e0d5b88..4797ee7 100644
--- a/c++/src/H5EnumType.h
+++ b/c++/src/H5EnumType.h
@@ -75,7 +75,7 @@ class H5_DLLCPP EnumType : public DataType {
         // Creates an enumeration datatype using an existing id
         EnumType(const hid_t existing_id);
 
-        // Copy constructor: makes a copy of the original EnumType object.
+        // Copy constructor: same as the original EnumType.
         EnumType(const EnumType& original);
 
         virtual ~EnumType();
diff --git a/c++/src/H5Exception.cpp b/c++/src/H5Exception.cpp
index c52a279..cf9e577 100644
--- a/c++/src/H5Exception.cpp
+++ b/c++/src/H5Exception.cpp
@@ -39,7 +39,7 @@ Exception::Exception(const H5std_string& func, const H5std_string& message) : de
 
 //--------------------------------------------------------------------------
 // Function:    Exception copy constructor
-///\brief       Copy constructor: makes a copy of the original Exception object.
+///\brief       Copy constructor: same HDF5 object as \a original
 ///\param       orig - IN: Exception instance to copy
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5FaccProp.cpp b/c++/src/H5FaccProp.cpp
index 9e1098b..286f6e7 100644
--- a/c++/src/H5FaccProp.cpp
+++ b/c++/src/H5FaccProp.cpp
@@ -88,7 +88,7 @@ FileAccPropList::FileAccPropList() : PropList(H5P_FILE_ACCESS) {}
 
 //--------------------------------------------------------------------------
 // Function:    FileAccPropList copy constructor
-///\brief       Copy Constructor: makes a copy of the original
+///\brief       Copy constructor: same HDF5 object as \a original
 ///\param       original - IN: FileAccPropList instance to copy
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5FaccProp.h b/c++/src/H5FaccProp.h
index 1df8fc8..58f049e 100644
--- a/c++/src/H5FaccProp.h
+++ b/c++/src/H5FaccProp.h
@@ -136,7 +136,7 @@ class H5_DLLCPP FileAccPropList : public PropList {
         ///\brief Returns this class name.
         virtual H5std_string fromClass () const { return("FileAccPropList"); }
 
-        // Copy constructor: creates a copy of a FileAccPropList object.
+        // Copy constructor: same as the original FileAccPropList.
         FileAccPropList(const FileAccPropList& original);
 
         // Creates a copy of an existing file access property list
diff --git a/c++/src/H5FcreatProp.cpp b/c++/src/H5FcreatProp.cpp
index 98a35cb..9b0fecc 100644
--- a/c++/src/H5FcreatProp.cpp
+++ b/c++/src/H5FcreatProp.cpp
@@ -86,7 +86,7 @@ FileCreatPropList::FileCreatPropList() : PropList(H5P_FILE_CREATE) {}
 
 //--------------------------------------------------------------------------
 // Function:    FileCreatPropList copy constructor
-///\brief       Copy constructor: makes a copy of the original
+///\brief       Copy constructor: same HDF5 object as \a original
 ///             FileCreatPropList object.
 ///\param       original - IN: FileCreatPropList instance to copy
 // Programmer   Binh-Minh Ribler - 2000
diff --git a/c++/src/H5FcreatProp.h b/c++/src/H5FcreatProp.h
index 31a944c..cc28920 100644
--- a/c++/src/H5FcreatProp.h
+++ b/c++/src/H5FcreatProp.h
@@ -79,7 +79,7 @@ class H5_DLLCPP FileCreatPropList : public PropList {
         ///\brief Returns this class name.
         virtual H5std_string fromClass() const { return("FileCreatPropList"); }
 
-        // Copy constructor: creates a copy of a FileCreatPropList object.
+        // Copy constructor: same as the original FileCreatPropList.
         FileCreatPropList(const FileCreatPropList& orig);
 
         // Creates a copy of an existing file create property list
diff --git a/c++/src/H5File.cpp b/c++/src/H5File.cpp
index 2c7ac51..f5246f9 100644
--- a/c++/src/H5File.cpp
+++ b/c++/src/H5File.cpp
@@ -46,7 +46,7 @@ namespace H5 {
 //--------------------------------------------------------------------------
 // Function     H5File default constructor
 ///\brief       Default constructor: creates a stub H5File object.
-// Programmer   Binh-Minh Ribler - 2000
+// December 2000
 //--------------------------------------------------------------------------
 H5File::H5File() : Group(), id(H5I_INVALID_HID) {}
 
@@ -78,7 +78,7 @@ H5File::H5File() : Group(), id(H5I_INVALID_HID) {}
 // Notes        With a PGI compiler (~2012-2013,) the exception thrown by
 //              p_get_file could not be caught in the applications.  Added try
 //              block here to catch then re-throw it. -BMR 2013/03/21
-// Programmer   Binh-Minh Ribler - 2000
+// December 2000
 //--------------------------------------------------------------------------
 H5File::H5File(const char* name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist) : Group(), id(H5I_INVALID_HID)
 {
@@ -103,7 +103,7 @@ H5File::H5File(const char* name, unsigned int flags, const FileCreatPropList& cr
 // Notes        With a PGI compiler (~2012-2013,) the exception thrown by
 //              p_get_file could not be caught in the applications.  Added try
 //              block here to catch then re-throw it. -BMR 2013/03/21
-// Programmer   Binh-Minh Ribler - 2000
+// December 2000
 //--------------------------------------------------------------------------
 H5File::H5File(const H5std_string& name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist) : Group(), id(H5I_INVALID_HID)
 {
@@ -118,7 +118,6 @@ H5File::H5File(const H5std_string& name, unsigned int flags, const FileCreatProp
 //--------------------------------------------------------------------------
 // This function is private and contains common code between the
 // constructors taking a string or a char*
-// Programmer   Binh-Minh Ribler - 2000
 // Modification
 //              - removed H5F_ACC_CREAT because H5Fcreate will fail with
 //              H5F_ACC_CREAT. - BMR, Sep 17, 2014
@@ -153,7 +152,6 @@ void H5File::p_get_file(const char* name, unsigned int flags, const FileCreatPro
 // Function:    H5File overloaded constructor
 ///\brief       Creates an H5File object using an existing file id.
 ///\param       existing_id - IN: Id of an existing file
-// Programmer   Binh-Minh Ribler - 2015
 // Description
 //      Mar 29, 2015
 //              Added in responding to a request from user Jason Newton.
@@ -172,10 +170,10 @@ H5File::H5File(hid_t existing_id) : Group()
 
 //--------------------------------------------------------------------------
 // Function:    H5File copy constructor
-///\brief       Copy constructor: makes a copy of the original
+///\brief       Copy constructor: same HDF5 object as \a original
 ///             H5File object.
 ///\param       original - IN: H5File instance to copy
-// Programmer   Binh-Minh Ribler - 2000
+// December 2000
 //--------------------------------------------------------------------------
 H5File::H5File(const H5File& original) : Group()
 {
@@ -189,7 +187,7 @@ H5File::H5File(const H5File& original) : Group()
 ///\param       name - IN: Name of the file
 ///\return      true if the file is in HDF5 format, and false, otherwise
 ///\exception   H5::FileIException
-// Programmer   Binh-Minh Ribler - 2000
+// December 2000
 //--------------------------------------------------------------------------
 bool H5File::isHdf5(const char* name)
 {
@@ -211,7 +209,7 @@ bool H5File::isHdf5(const char* name)
 ///\brief       This is an overloaded member function, provided for convenience.
 ///             It takes an \c H5std_string for \a name. (Static)
 ///\param       name - IN: Name of the file - \c H5std_string
-// Programmer   Binh-Minh Ribler - 2000
+// December 2000
 //--------------------------------------------------------------------------
 bool H5File::isHdf5(const H5std_string& name)
 {
@@ -234,7 +232,7 @@ bool H5File::isHdf5(const H5std_string& name)
 ///
 ///             H5F_ACC_RDONLY: Open with read only access. - default
 ///
-// Programmer   Binh-Minh Ribler - Oct, 2005
+// October 2005
 //--------------------------------------------------------------------------
 void H5File::openFile(const char* name, unsigned int flags, const FileAccPropList& access_plist)
 {
@@ -261,7 +259,7 @@ void H5File::openFile(const char* name, unsigned int flags, const FileAccPropLis
 ///\param       flags        - IN: File access flags
 ///\param       access_plist - IN: File access property list.  Default to
 ///             FileAccPropList::DEFAULT
-// Programmer   Binh-Minh Ribler - 2000
+// December 2000
 //--------------------------------------------------------------------------
 void H5File::openFile(const H5std_string& name, unsigned int flags, const FileAccPropList& access_plist)
 {
@@ -276,7 +274,6 @@ void H5File::openFile(const H5std_string& name, unsigned int flags, const FileAc
 // Description
 //              If this object has represented another HDF5 file, the previous
 //              HDF5 file need to be closed first.
-// Programmer   Binh-Minh Ribler - 2000
 // Note:        This wrapper doesn't seem right regarding the 'id' and should
 //              be investigated.  BMR - 2/20/2005
 // Modification
@@ -303,10 +300,10 @@ void H5File::reOpen()
 
 //--------------------------------------------------------------------------
 // Function:    H5File::getCreatePlist
-///\brief       Returns the creation property list of this file
+///\brief       Returns a copy of the creation property list of this file
 ///\return      FileCreatPropList object
 ///\exception   H5::FileIException
-// Programmer   Binh-Minh Ribler - 2000
+// December 2000
 //--------------------------------------------------------------------------
 FileCreatPropList H5File::getCreatePlist() const
 {
@@ -327,10 +324,10 @@ FileCreatPropList H5File::getCreatePlist() const
 
 //--------------------------------------------------------------------------
 // Function:    H5File::getAccessPlist
-///\brief       Returns the access property list of this file
+///\brief       Returns a copy of the access property list of this file
 ///\return      FileAccPropList object
 ///\exception   H5::FileIException
-// Programmer   Binh-Minh Ribler - 2000
+// December 2000
 //--------------------------------------------------------------------------
 FileAccPropList H5File::getAccessPlist() const
 {
@@ -357,7 +354,7 @@ FileAccPropList H5File::getAccessPlist() const
 ///\par Description
 ///             The retrieved information may include information about
 ///             superblock extension, free space management, and shared object
-// Programmer   Binh-Minh Ribler - February 2017
+// February 2017
 //--------------------------------------------------------------------------
 void H5File::getFileInfo(H5F_info2_t& file_info) const
 {
@@ -373,7 +370,7 @@ void H5File::getFileInfo(H5F_info2_t& file_info) const
 ///\brief       Returns the amount of free space in the file.
 ///\return      Amount of free space
 ///\exception   H5::FileIException
-// Programmer   Binh-Minh Ribler - May 2004
+// May 2004
 //--------------------------------------------------------------------------
 hssize_t H5File::getFreeSpace() const
 {
@@ -405,7 +402,7 @@ hssize_t H5File::getFreeSpace() const
 ///                         | \c H5F_OBJ_DATATYPE | \c H5F_OBJ_ATTR
 ///\par
 /// Multiple object types can be combined with the logical OR operator (|).
-// Programmer   Binh-Minh Ribler - May 2004
+// May 2004
 //--------------------------------------------------------------------------
 ssize_t H5File::getObjCount(unsigned types) const
 {
@@ -440,7 +437,7 @@ ssize_t H5File::getObjCount(unsigned types) const
 /// Multiple object types can be combined with the logical OR operator (|).
 //
 // Notes: will do the overload for this one after hearing from Quincey???
-// Programmer   Binh-Minh Ribler - May 2004
+// May 2004
 //--------------------------------------------------------------------------
 void H5File::getObjIDs(unsigned types, size_t max_objs, hid_t *oid_list) const
 {
@@ -468,7 +465,7 @@ void H5File::getObjIDs(unsigned types, size_t max_objs, hid_t *oid_list) const
 ///             The obtained file handle is dynamic and is valid only while
 ///             the file remains open; it will be invalid if the file is
 ///             closed and reopened or opened during a subsequent session.
-// Programmer   Binh-Minh Ribler - May 2004
+// May 2004
 //--------------------------------------------------------------------------
 void H5File::getVFDHandle(const FileAccPropList& fapl, void **file_handle) const
 {
@@ -489,7 +486,7 @@ void H5File::getVFDHandle(const FileAccPropList& fapl, void **file_handle) const
 // Param        file_handle - Pointer to the file handle being used by
 //                            the low-level virtual file driver
 // Exception    H5::FileIException
-// Programmer   Binh-Minh Ribler - May 2004
+// May 2004
 // Modification
 //              Planned for removal. -BMR, 2014/04/16
 //              Removed from documentation. -BMR, 2016/03/07 1.8.17 and 1.10.0
@@ -508,7 +505,7 @@ void H5File::getVFDHandle(const FileAccPropList& fapl, void **file_handle) const
 ///\param       file_handle - Pointer to the file handle being used by
 ///                     the low-level virtual file driver
 ///\exception   H5::FileIException
-// Programmer   Binh-Minh Ribler - May 2004
+// May 2004
 //--------------------------------------------------------------------------
 void H5File::getVFDHandle(void **file_handle) const
 {
@@ -550,7 +547,7 @@ hsize_t H5File::getFileSize() const
 //              AbstractDS and Attribute are moved out of H5Object.  In
 //              addition, member IdComponent::id is moved into subclasses, and
 //              IdComponent::getId now becomes pure virtual function.
-// Programmer   Binh-Minh Ribler - May, 2008
+// May, 2008
 //--------------------------------------------------------------------------
 hid_t H5File::getId() const
 {
@@ -564,7 +561,7 @@ hid_t H5File::getId() const
 // Exception    H5::FileIException
 // Description
 //              This function is replaced by the above function reOpen.
-// Programmer   Binh-Minh Ribler - 2000
+// December 2000
 //--------------------------------------------------------------------------
 void H5File::reopen()
 {
@@ -577,7 +574,7 @@ void H5File::reopen()
 // Description
 //              This function is a redefinition of CommonFG::getLocId.  It
 //              is used by CommonFG member functions to get the file id.
-// Programmer   Binh-Minh Ribler - 2000
+// December 2000
 // Deprecated:
 //      Aug 18, 2016 -BMR
 //              After HDFFV-9920, the Group's methods can use getId() and
@@ -598,7 +595,7 @@ hid_t H5File::getLocId() const
 //              The underlaying reference counting in the C library ensures
 //              that the current valid id of this object is properly closed.
 //              Then the object's id is reset to the new id.
-// Programmer   Binh-Minh Ribler - 2000
+// December 2000
 //--------------------------------------------------------------------------
 void H5File::p_setId(const hid_t new_id)
 {
@@ -619,7 +616,7 @@ void H5File::p_setId(const hid_t new_id)
 ///\brief       Closes this HDF5 file.
 ///
 ///\exception   H5::FileIException
-// Programmer   Binh-Minh Ribler - Mar 9, 2005
+// March 2005
 //--------------------------------------------------------------------------
 void H5File::close()
 {
@@ -646,7 +643,7 @@ void H5File::close()
 //              proper exception can be thrown for file or group.  The
 //              "H5File::" will be inserted to indicate the function called is
 //              an implementation of H5File.
-// Programmer   Binh-Minh Ribler - 2000
+// December 2000
 //--------------------------------------------------------------------------
 void H5File::throwException(const H5std_string& func_name, const H5std_string& msg) const
 {
@@ -658,7 +655,7 @@ void H5File::throwException(const H5std_string& func_name, const H5std_string& m
 //--------------------------------------------------------------------------
 // Function:    H5File destructor
 ///\brief       Properly terminates access to this file.
-// Programmer   Binh-Minh Ribler - 2000
+// December 2000
 // Modification
 //              - Replaced resetIdComponent() with decRefCount() to use C
 //              library ID reference counting mechanism - BMR, Feb 20, 2005
diff --git a/c++/src/H5File.h b/c++/src/H5File.h
index 214feb0..473428a 100644
--- a/c++/src/H5File.h
+++ b/c++/src/H5File.h
@@ -41,10 +41,10 @@ class H5_DLLCPP H5File : public Group {
         // Close this file.
         virtual void close();
 
-        // Gets the access property list of this file.
+        // Gets a copy of the access property list of this file.
         FileAccPropList getAccessPlist() const;
 
-        // Gets the creation property list of this file.
+        // Gets a copy of the creation property list of this file.
         FileCreatPropList getCreatePlist() const;
 
         // Gets general information about this file.
@@ -97,7 +97,7 @@ class H5_DLLCPP H5File : public Group {
         // Default constructor
         H5File();
 
-        // Copy constructor: makes a copy of the original H5File object.
+        // Copy constructor: same as the original H5File.
         H5File(const H5File& original);
 
         // Gets the HDF5 file id.
diff --git a/c++/src/H5FloatType.cpp b/c++/src/H5FloatType.cpp
index 9703149..0a2c107 100644
--- a/c++/src/H5FloatType.cpp
+++ b/c++/src/H5FloatType.cpp
@@ -66,7 +66,7 @@ FloatType::FloatType(const hid_t existing_id) : AtomType( existing_id ) {}
 
 //--------------------------------------------------------------------------
 // Function:    FloatType copy constructor
-///\brief       Copy constructor: makes a copy of the original FloatType object.
+///\brief       Copy constructor: same HDF5 object as \a original
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 FloatType::FloatType(const FloatType&  original) : AtomType( original ){}
diff --git a/c++/src/H5FloatType.h b/c++/src/H5FloatType.h
index d26df5c..f74a9ae 100644
--- a/c++/src/H5FloatType.h
+++ b/c++/src/H5FloatType.h
@@ -71,7 +71,7 @@ class H5_DLLCPP FloatType : public AtomType {
         // Creates a floating-point datatype using an existing id.
         FloatType(const hid_t existing_id);
 
-        // Copy constructor: makes a copy of the original FloatType object.
+        // Copy constructor: same as the original FloatType.
         FloatType(const FloatType& original);
 
         // Noop destructor.
diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp
index c4c7017..25e67d3 100644
--- a/c++/src/H5Group.cpp
+++ b/c++/src/H5Group.cpp
@@ -53,7 +53,7 @@ Group::Group() : H5Object(), CommonFG(), id(H5I_INVALID_HID) {}
 
 //--------------------------------------------------------------------------
 // Function:    Group copy constructor
-///\brief       Copy constructor: makes a copy of the original Group object.
+///\brief       Copy constructor: same HDF5 object as \a original
 ///\param       original - IN: Original group to copy
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5Group.h b/c++/src/H5Group.h
index b3a9007..70b6bff 100644
--- a/c++/src/H5Group.h
+++ b/c++/src/H5Group.h
@@ -53,7 +53,7 @@ class H5_DLLCPP Group : public H5Object, public CommonFG {
         // default constructor
         Group();
 
-        // Copy constructor: makes a copy of the original object
+        // Copy constructor: same as the original Group.
         Group(const Group& original);
 
         // Gets the group id.
diff --git a/c++/src/H5IdComponent.h b/c++/src/H5IdComponent.h
index baf939e..b4070b0 100644
--- a/c++/src/H5IdComponent.h
+++ b/c++/src/H5IdComponent.h
@@ -60,21 +60,8 @@ class H5_DLLCPP IdComponent {
         // Sets the identifier of this object to a new value.
         void setId(const hid_t new_id);
 
-        // *** Deprecation warning ***
-        // The following two constructors are no longer appropriate after the
-        // data member "id" had been moved to the sub-classes.
-        // The copy constructor is a noop and is removed in 1.8.15 and the
-        // other will be removed from 1.10 release, and then from 1.8 if its
-        // removal does not raise any problems in two 1.10 releases.
-
-        // Creates an object to hold an HDF5 identifier.
-        // IdComponent(const hid_t h5_id); - removed from 1.10.1
-
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 
-        // Copy constructor: makes copy of the original IdComponent object.
-        // IdComponent(const IdComponent& original); - removed from 1.8.15
-
         // Gets the identifier of this object.
         virtual hid_t getId () const = 0;
 
diff --git a/c++/src/H5IntType.cpp b/c++/src/H5IntType.cpp
index 38191bc..dd9d042 100644
--- a/c++/src/H5IntType.cpp
+++ b/c++/src/H5IntType.cpp
@@ -43,7 +43,7 @@ IntType::IntType() {}
 
 //--------------------------------------------------------------------------
 // Function:    IntType copy constructor
-///\brief       Copy constructor: makes a copy of the original IntType object.
+///\brief       Copy constructor: same HDF5 object as \a original
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 IntType::IntType(const IntType& original) : AtomType( original ) {}
diff --git a/c++/src/H5IntType.h b/c++/src/H5IntType.h
index a9ebad0..496872b 100644
--- a/c++/src/H5IntType.h
+++ b/c++/src/H5IntType.h
@@ -53,7 +53,7 @@ class H5_DLLCPP IntType : public AtomType {
         // Creates a integer datatype using an existing id
         IntType(const hid_t existing_id);
 
-        // Copy constructor: makes copy of IntType object
+        // Copy constructor: same as the original IntType.
         IntType(const IntType& original);
 
         // Noop destructor.
diff --git a/c++/src/H5LaccProp.cpp b/c++/src/H5LaccProp.cpp
index 1267286..49ffa2b 100644
--- a/c++/src/H5LaccProp.cpp
+++ b/c++/src/H5LaccProp.cpp
@@ -88,7 +88,7 @@ LinkAccPropList::LinkAccPropList() : PropList(H5P_LINK_ACCESS) {}
 
 //--------------------------------------------------------------------------
 // Function:    LinkAccPropList copy constructor
-///\brief       Copy Constructor: makes a copy of the original
+///\brief       Copy Constructor: same HDF5 object as \a original
 ///\param       original - IN: LinkAccPropList instance to copy
 // Programmer   Binh-Minh Ribler - December, 2016
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5LaccProp.h b/c++/src/H5LaccProp.h
index 6c86a85..70890b3 100644
--- a/c++/src/H5LaccProp.h
+++ b/c++/src/H5LaccProp.h
@@ -36,7 +36,7 @@ class H5_DLLCPP LinkAccPropList : public PropList {
         ///\brief Returns this class name.
         virtual H5std_string fromClass () const { return("LinkAccPropList"); }
 
-        // Copy constructor: creates a copy of a LinkAccPropList object.
+        // Copy constructor: same as the original LinkAccPropList.
         LinkAccPropList(const LinkAccPropList& original);
 
         // Creates a copy of an existing file access property list
diff --git a/c++/src/H5LcreatProp.cpp b/c++/src/H5LcreatProp.cpp
index 4f8bffc..8bece44 100644
--- a/c++/src/H5LcreatProp.cpp
+++ b/c++/src/H5LcreatProp.cpp
@@ -88,7 +88,7 @@ LinkCreatPropList::LinkCreatPropList() : PropList(H5P_LINK_CREATE) {}
 
 //--------------------------------------------------------------------------
 // Function:    LinkCreatPropList copy constructor
-///\brief       Copy Constructor: makes a copy of the original
+///\brief       Copy constructor: same HDF5 object as \a original
 ///\param       original - IN: LinkCreatPropList instance to copy
 // December, 2016
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5LcreatProp.h b/c++/src/H5LcreatProp.h
index 4ac2191..12cb479 100644
--- a/c++/src/H5LcreatProp.h
+++ b/c++/src/H5LcreatProp.h
@@ -36,7 +36,7 @@ class H5_DLLCPP LinkCreatPropList : public PropList {
         ///\brief Returns this class name.
         virtual H5std_string fromClass () const { return("LinkCreatPropList"); }
 
-        // Copy constructor: creates a copy of a LinkCreatPropList object.
+        // Copy constructor: same as the original LinkCreatPropList.
         LinkCreatPropList(const LinkCreatPropList& original);
 
         // Creates a copy of an existing file access property list
diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp
index 27881c4..5d102d7 100644
--- a/c++/src/H5Object.cpp
+++ b/c++/src/H5Object.cpp
@@ -58,35 +58,6 @@ extern "C" herr_t userAttrOpWrpr(hid_t loc_id, const char *attr_name,
 H5Object::H5Object() : H5Location() {}
 
 //--------------------------------------------------------------------------
-// Function:    H5Object overloaded constructor (protected)
-// Purpose      Creates an H5Object object using the id of an existing HDF5
-//              object.
-// Parameters   object_id - IN: Id of an existing HDF5 object
-// Programmer   Binh-Minh Ribler - 2000
-// *** Deprecation warning ***
-// This constructor is no longer appropriate because the data member "id" had
-// been moved to the sub-classes.  It will be removed in 1.10 release.  If its
-// removal does not raise any problems in 1.10, it will be removed from 1.8 in
-// subsequent releases.
-// Removed in 1.10.1 - Aug 2016
-//--------------------------------------------------------------------------
-//H5Object::H5Object(const hid_t object_id) : H5Location() {}
-
-//--------------------------------------------------------------------------
-// Function:    H5Object copy constructor
-///\brief       Copy constructor: makes a copy of the original H5Object
-///             instance.
-///\param       original - IN: H5Object instance to copy
-// Programmer   Binh-Minh Ribler - 2000
-// *** Deprecation warning ***
-// This constructor is no longer appropriate because the data member "id" had
-// been moved to the sub-classes.  It is removed from 1.8.15 because it is
-// a noop and it can be generated by the compiler if needed.
-// Removed in 1.10.1 - Aug 2016
-//--------------------------------------------------------------------------
-// H5Object::H5Object(const H5Object& original) : H5Location() {}
-
-//--------------------------------------------------------------------------
 // Function:    f_Attribute_setId - friend
 // Purpose:     This function is friend to class H5::Attribute so that it
 //              can set Attribute::id in order to work around a problem
diff --git a/c++/src/H5Object.h b/c++/src/H5Object.h
index 3772e08..10b3865 100644
--- a/c++/src/H5Object.h
+++ b/c++/src/H5Object.h
@@ -104,19 +104,6 @@ class H5_DLLCPP H5Object : public H5Location {
         // Default constructor
         H5Object();
 
-        // *** Deprecation warning ***
-        // The following two constructors are no longer appropriate after the
-        // data member "id" had been moved to the sub-classes.
-        // The copy constructor is a noop and is removed in 1.8.15 and the
-        // other will be removed from 1.10 release, and then from 1.8 if its
-        // removal does not raise any problems in two 1.10 releases.
-
-        // Creates a copy of an existing object giving the object id
-        // H5Object(const hid_t object_id);
-
-        // Copy constructor: makes copy of an H5Object object.
-        // H5Object(const H5Object& original);
-
         // Sets the identifier of this object to a new value. - this one
         // doesn't increment reference count
         virtual void p_setId(const hid_t new_id) = 0;
diff --git a/c++/src/H5OcreatProp.cpp b/c++/src/H5OcreatProp.cpp
index 121198c..0542d5e 100644
--- a/c++/src/H5OcreatProp.cpp
+++ b/c++/src/H5OcreatProp.cpp
@@ -88,7 +88,7 @@ ObjCreatPropList::ObjCreatPropList() : PropList(H5P_OBJECT_CREATE) {}
 
 //--------------------------------------------------------------------------
 // Function:    ObjCreatPropList copy constructor
-///\brief       Copy Constructor: makes a copy of the original
+///\brief       Copy constructor: same HDF5 object as \a original
 ///\param       original - IN: ObjCreatPropList instance to copy
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5OcreatProp.h b/c++/src/H5OcreatProp.h
index d1eae86..1d5dd55 100644
--- a/c++/src/H5OcreatProp.h
+++ b/c++/src/H5OcreatProp.h
@@ -46,7 +46,7 @@ class H5_DLLCPP ObjCreatPropList : public PropList {
         ///\brief Returns this class name.
         virtual H5std_string fromClass () const { return("ObjCreatPropList"); }
 
-        // Copy constructor: creates a copy of a ObjCreatPropList object.
+        // Copy constructor: same as the original ObjCreatPropList.
         ObjCreatPropList(const ObjCreatPropList& original);
 
         // Creates a copy of an existing object creation property list
diff --git a/c++/src/H5PredType.cpp b/c++/src/H5PredType.cpp
index 704a617..3f153e5 100644
--- a/c++/src/H5PredType.cpp
+++ b/c++/src/H5PredType.cpp
@@ -55,7 +55,7 @@ PredType::PredType() : AtomType() {}
 
 //--------------------------------------------------------------------------
 // Function:    PredType copy constructor
-///\brief       Copy constructor: makes a copy of the original PredType object.
+///\brief       Copy constructor: same HDF5 object as \a original
 ///\param       original - IN: PredType instance to copy
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5PredType.h b/c++/src/H5PredType.h
index c631fb9..0978384 100644
--- a/c++/src/H5PredType.h
+++ b/c++/src/H5PredType.h
@@ -34,7 +34,7 @@ class H5_DLLCPP PredType : public AtomType {
         // id in the left hand side object.
         PredType& operator=(const PredType& rhs);
 
-        // Copy constructor - makes copy of the original object
+        // Copy constructor: same as the original PredType.
         PredType(const PredType& original);
 
         // Noop destructor
diff --git a/c++/src/H5PropList.cpp b/c++/src/H5PropList.cpp
index 16a6316..ef9e16d 100644
--- a/c++/src/H5PropList.cpp
+++ b/c++/src/H5PropList.cpp
@@ -94,7 +94,7 @@ PropList::PropList() : IdComponent(), id(H5P_DEFAULT) {}
 
 //--------------------------------------------------------------------------
 // Function:    PropList copy constructor
-///\brief       Copy constructor
+///\brief       Copy constructor: same HDF5 object as \a original
 ///\param       original - IN: The original property list to copy
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5PropList.h b/c++/src/H5PropList.h
index 6e1e287..e0244c1 100644
--- a/c++/src/H5PropList.h
+++ b/c++/src/H5PropList.h
@@ -106,7 +106,7 @@ class H5_DLLCPP PropList : public IdComponent {
         // Default constructor: creates a stub PropList object.
         PropList();
 
-        // Copy constructor: creates a copy of a PropList object.
+        // Copy constructor: same as the original PropList.
         PropList(const PropList& original);
 
         // Gets the property list id.
diff --git a/c++/src/H5StrType.cpp b/c++/src/H5StrType.cpp
index 4c0b3d2..a067d6c 100644
--- a/c++/src/H5StrType.cpp
+++ b/c++/src/H5StrType.cpp
@@ -120,7 +120,7 @@ StrType::StrType(const hid_t existing_id) : AtomType( existing_id ) {}
 
 //--------------------------------------------------------------------------
 // Function:    StrType copy constructor
-///\brief       Copy constructor: makes a copy of the original StrType object.
+///\brief       Copy constructor: same HDF5 object as \a original
 // Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 StrType::StrType(const StrType& original) : AtomType ( original ) {}
diff --git a/c++/src/H5StrType.h b/c++/src/H5StrType.h
index 24c9ca3..38974da 100644
--- a/c++/src/H5StrType.h
+++ b/c++/src/H5StrType.h
@@ -65,7 +65,7 @@ class H5_DLLCPP StrType : public AtomType {
         // Creates a string datatype using an existing id
         StrType(const hid_t existing_id);
 
-        // Copy constructor - makes a copy of the original object
+        // Copy constructor: same as the original StrType.
         StrType(const StrType& original);
 
         // Noop destructor.
diff --git a/c++/src/H5VarLenType.cpp b/c++/src/H5VarLenType.cpp
index 188ee41..e70d42f 100644
--- a/c++/src/H5VarLenType.cpp
+++ b/c++/src/H5VarLenType.cpp
@@ -45,7 +45,7 @@ VarLenType::VarLenType(const hid_t existing_id) : DataType(existing_id) {}
 
 //--------------------------------------------------------------------------
 // Function:    VarLenType copy constructor
-///\brief       Copy constructor: makes a copy of the original VarLenType object.
+///\brief       Copy constructor: same HDF5 object as \a original
 // Programmer   Binh-Minh Ribler - May, 2004
 //--------------------------------------------------------------------------
 VarLenType::VarLenType(const VarLenType& original) : DataType(original) {}
diff --git a/c++/src/H5VarLenType.h b/c++/src/H5VarLenType.h
index 078b534..ab3c14c 100644
--- a/c++/src/H5VarLenType.h
+++ b/c++/src/H5VarLenType.h
@@ -38,7 +38,7 @@ class H5_DLLCPP VarLenType : public DataType {
         ///\brief Returns this class name.
         virtual H5std_string fromClass () const { return("VarLenType"); }
 
-        // Copy constructor: makes copy of the original object.
+        // Copy constructor: same as the original VarLenType.
         VarLenType(const VarLenType& original);
 
         // Constructor that takes an existing id