Merge branch 'NUG_clean_ethan' of https://github.com/ethanrd/netcdf-c into gh1636.wif

Author: WardF

docs/CMakeLists.txt

@@ -84,13 +84,13 @@ ENDIF(ENABLE_DOXYGEN)
 # Should match list in Makefile.am
 SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST}
 netcdf.m4 DoxygenLayout.xml Doxyfile.in footer.html
-mainpage.dox tutorial.dox guide.dox types.dox cdl.dox
+mainpage.dox tutorial.dox guide.dox types.dox
 architecture.dox internal.dox windows-binaries.md
 building-with-cmake.md CMakeLists.txt groups.dox install.md notes.md
 install-fortran.md all-error-codes.md credits.md auth.md
 obsolete/fan_utils.html bestpractices.md filters.md indexing.md
-inmemory.md DAP2.dox attribute_conventions.md FAQ.md
-file_format_specifications.md known_problems.md
+inmemory.md DAP2.dox FAQ.md
+known_problems.md
 COPYRIGHT.dox user_defined_formats.md DAP4.md DAP4.dox
 testserver.dox byterange.dox filters.md nczarr.md auth.md)
 

docs/Doxyfile.in

@@ -745,7 +745,6 @@ INPUT = \
     @abs_top_srcdir@/docs/inmemory.md \
     @abs_top_srcdir@/docs/filters.md \
     @abs_top_srcdir@/docs/byterange.dox \
-    @abs_top_srcdir@/docs/auth.md \
     @abs_top_srcdir@/docs/nczarr.md \
     @abs_top_srcdir@/docs/notes.md \
     @abs_top_srcdir@/docs/all-error-codes.md \

docs/Makefile.am

@@ -8,13 +8,13 @@
 
 # These files will be included with the dist.
 EXTRA_DIST = netcdf.m4 DoxygenLayout.xml Doxyfile.in footer.html	\
-mainpage.dox tutorial.dox cdl.dox			\
+mainpage.dox tutorial.dox			\
 architecture.dox internal.dox windows-binaries.md			\
 building-with-cmake.md CMakeLists.txt groups.dox notes.md	\
 install-fortran.md all-error-codes.md credits.md auth.md filters.md \
 obsolete/fan_utils.html indexing.dox	\
-inmemory.md attribute_conventions.md FAQ.md	                \
-file_format_specifications.md known_problems.md COPYRIGHT.md		\
+inmemory.md FAQ.md	                \
+known_problems.md COPYRIGHT.md		\
 inmeminternal.dox              \
 testserver.dox byterange.dox   \
 nczarr.md