Merge changes between branches (#1930)

* Merge changes between branches

* More merge synchs

5 files changed, 17 insertions, 14 deletions

diff --git a/doxygen/dox/RFC.dox b/doxygen/dox/RFC.dox
index c16dcea..3cda309 100644
--- a/doxygen/dox/RFC.dox
+++ b/doxygen/dox/RFC.dox
@@ -88,4 +88,4 @@
 <tr> <td>2004-08-11</td> <td>\ref_rfc20040811</td> <td></td> </tr>
 </table>
 
-*/
\ No newline at end of file
+*/
diff --git a/doxygen/dox/ReferenceManual.dox b/doxygen/dox/ReferenceManual.dox
index cd438c2..2e1b8e9 100644
--- a/doxygen/dox/ReferenceManual.dox
+++ b/doxygen/dox/ReferenceManual.dox
@@ -9,7 +9,7 @@ The functions provided by the HDF5 C-API are grouped into the following
 <td>
 
 <table>
-<tr><td style="border: none;">
+<tr valign="top"><td style="border: none;">
 \li \ref H5A "Attributes (H5A)"
 \li \ref H5D "Datasets (H5D)"
 \li \ref H5S "Dataspaces (H5S)"
@@ -27,8 +27,6 @@ The functions provided by the HDF5 C-API are grouped into the following
 \li \ref H5PL "Dynamically-loaded Plugins (H5PL)"
 \li \ref H5R "References (H5R)"
 </td><td style="border: none;vertical-align: top;">
-\li \ref api-compat-macros
-\li <a href="./deprecated.html">Deprecated functions</a>
 \li \ref high_level
     <ul>
     <li>\ref H5LT "Lite (H5LT, H5LD)"
@@ -44,11 +42,14 @@ The functions provided by the HDF5 C-API are grouped into the following
 \a Core \a library: \ref H5 \ref H5A \ref H5D \ref H5E \ref H5F \ref H5G \ref H5I \ref H5L
 \ref H5O \ref H5P \ref H5PL \ref H5R \ref H5S \ref H5T \ref H5Z
 </td></tr>
-
 <tr><td colspan="3" style="border: none;">
 \a High-level \a library: \ref H5LT \ref H5IM \ref H5TB \ref H5PT \ref H5DS \ref H5DO \ref H5LR
 </td></tr>
-
+<tr>
+<td><a href="./deprecated.html">Deprecated functions</a></td>
+<td>Functions with \ref ASYNC</td>
+<td>\ref api-compat-macros</td>
+</tr>
 </table>
 
 </td></tr>
diff --git a/doxygen/dox/UsersGuide.dox b/doxygen/dox/UsersGuide.dox
index 0e2b4fd..d6d0dcb 100644
--- a/doxygen/dox/UsersGuide.dox
+++ b/doxygen/dox/UsersGuide.dox
@@ -405,13 +405,15 @@ Previous Chapter \ref sec_plist
 </td><td style="border: none;vertical-align: top;">
 \li \ref api-compat-macros
 \li <a href="./deprecated.html">Deprecated functions</a>
-\li High-level Extensions
+\li \ref high_level
     <ul>
-    <li><a href="https://portal.hdfgroup.org/display/HDF5/Lite">\Bold{HDF5 Lite} (H5LT)</a></li>
-    <li><a href="https://portal.hdfgroup.org/display/HDF5/Images">\Bold{HDF5 Image} (H5IM)</a></li>
-    <li><a href="https://portal.hdfgroup.org/display/HDF5/Tables">\Bold{HDF5 Table} (H5TB)</a></li>
-    <li><a href="https://portal.hdfgroup.org/display/HDF5/Packet+Tables">\Bold{HDF5 Packet Table} (H5TB)</a></li>
-    <li><a href="https://portal.hdfgroup.org/display/HDF5/Dimension+Scales">\Bold{HDF5 Dimension Scale} (H5DS)</a></li>
+    <li>\ref H5LT "Lite (H5LT, H5LD)"
+    <li>\ref H5IM "Images (H5IM)"
+    <li>\ref H5TB "Table (H5TB)"
+    <li>\ref H5PT "Packet Table (H5PT)"
+    <li>\ref H5DS "Dimension Scale (H5DS)"
+    <li>\ref H5DO "Optimizations (H5DO)"
+    <li>\ref H5LR "Extensions (H5LR, H5LT)"
     </ul>
 </td></tr>
 <tr><td colspan="3" style="border: none;">
diff --git a/doxygen/examples/H5.format.1.0.html b/doxygen/examples/H5.format.1.0.html
index 041cdb6..4eb0548 100644
--- a/doxygen/examples/H5.format.1.0.html
+++ b/doxygen/examples/H5.format.1.0.html
@@ -732,7 +732,7 @@ Elena>               "Free-space object"
 		    only does the level indicate whether child pointers
 		    point to sub-trees or to data, but it can also be used
 		    to help file consistency checking utilities reconstruct
-		    damanged trees.</td>
+		    damaged trees.</td>
 		</tr>
 
 		<tr valign=top>
diff --git a/doxygen/examples/H5.format.1.1.html b/doxygen/examples/H5.format.1.1.html
index 4b6d42d..9d03a76 100644
--- a/doxygen/examples/H5.format.1.1.html
+++ b/doxygen/examples/H5.format.1.1.html
@@ -1059,7 +1059,7 @@ TABLE.list TD { border:none; }
             only does the level indicate whether child pointers
             point to sub-trees or to data, but it can also be used
             to help file consistency checking utilities reconstruct
-            damanged trees.
+            damaged trees.
             </P>
           </td>
         </tr>